home *** CD-ROM | disk | FTP | other *** search
| Emacs Compiled Lisp | 1998-05-21 | 67.9 KB |
open in: 
MacOS 8.1
|
Win98
|
DOS
view JSON data
|
view as text
This file was processed as: Emacs Compiled Lisp
(other/emacsCompiledLisp).
This format is not currently supported by dexvert.
hex view+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 14 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 6a 75 73 74 69 6e 62 |piled by| justinb|
|00000020| 40 65 62 6f 6e 79 2e 63 | 72 61 79 2e 63 6f 6d 20 |@ebony.c|ray.com |
|00000030| 6f 6e 20 4d 6f 6e 20 4d | 61 72 20 20 39 20 31 32 |on Mon M|ar 9 12|
|00000040| 3a 35 32 3a 32 36 20 31 | 39 39 38 0a 3b 3b 3b 20 |:52:26 1|998.;;; |
|00000050| 66 72 6f 6d 20 66 69 6c | 65 20 2f 68 6f 6d 65 2f |from fil|e /home/|
|00000060| 61 73 70 65 6e 30 37 2f | 6a 75 73 74 69 6e 62 2f |aspen07/|justinb/|
|00000070| 72 6f 6f 74 73 2f 66 72 | 65 65 77 61 72 65 2f 78 |roots/fr|eeware/x|
|00000080| 65 6d 61 63 73 2f 32 30 | 2e 33 2f 78 65 6d 61 63 |emacs/20|.3/xemac|
|00000090| 73 2d 32 30 2e 33 2f 6c | 69 73 70 2f 70 61 63 6b |s-20.3/l|isp/pack|
|000000a0| 61 67 65 73 2f 65 6d 65 | 72 67 65 2e 65 6c 0a 3b |ages/eme|rge.el.;|
|000000b0| 3b 3b 20 65 6d 61 63 73 | 20 76 65 72 73 69 6f 6e |;; emacs| version|
|000000c0| 20 32 30 2e 34 20 22 45 | 6d 65 72 61 6c 64 22 20 | 20.4 "E|merald" |
|000000d0| 58 45 6d 61 63 73 20 20 | 4c 75 63 69 64 2e 0a 3b |XEmacs |Lucid..;|
|000000e0| 3b 3b 20 62 79 74 65 63 | 6f 6d 70 20 76 65 72 73 |;; bytec|omp vers|
|000000f0| 69 6f 6e 20 32 2e 32 35 | 20 58 45 6d 61 63 73 3b |ion 2.25| XEmacs;|
|00000100| 20 32 32 2d 4d 61 72 2d | 39 36 2e 0a 3b 3b 3b 20 | 22-Mar-|96..;;; |
|00000110| 6f 70 74 69 6d 69 7a 61 | 74 69 6f 6e 20 69 73 20 |optimiza|tion is |
|00000120| 6f 6e 2e 0a 3b 3b 3b 20 | 74 68 69 73 20 66 69 6c |on..;;; |this fil|
|00000130| 65 20 75 73 65 73 20 6f | 70 63 6f 64 65 73 20 77 |e uses o|pcodes w|
|00000140| 68 69 63 68 20 64 6f 20 | 6e 6f 74 20 65 78 69 73 |hich do |not exis|
|00000150| 74 20 69 6e 20 45 6d 61 | 63 73 20 31 39 2e 0a 0a |t in Ema|cs 19...|
|00000160| 28 69 66 20 28 61 6e 64 | 20 28 62 6f 75 6e 64 70 |(if (and| (boundp|
|00000170| 20 27 65 6d 61 63 73 2d | 76 65 72 73 69 6f 6e 29 | 'emacs-|version)|
|00000180| 0a 09 20 28 6f 72 20 28 | 61 6e 64 20 28 62 6f 75 |.. (or (|and (bou|
|00000190| 6e 64 70 20 27 65 70 6f | 63 68 3a 3a 76 65 72 73 |ndp 'epo|ch::vers|
|000001a0| 69 6f 6e 29 20 65 70 6f | 63 68 3a 3a 76 65 72 73 |ion) epo|ch::vers|
|000001b0| 69 6f 6e 29 0a 09 20 20 | 20 20 20 28 73 74 72 69 |ion).. | (stri|
|000001c0| 6e 67 2d 6c 65 73 73 70 | 20 65 6d 61 63 73 2d 76 |ng-lessp| emacs-v|
|000001d0| 65 72 73 69 6f 6e 20 22 | 32 30 22 29 29 29 0a 20 |ersion "|20"))). |
|000001e0| 20 20 20 28 65 72 72 6f | 72 20 22 60 65 6d 65 72 | (erro|r "`emer|
|000001f0| 67 65 2e 65 6c 27 20 77 | 61 73 20 63 6f 6d 70 69 |ge.el' w|as compi|
|00000200| 6c 65 64 20 66 6f 72 20 | 45 6d 61 63 73 20 32 30 |led for |Emacs 20|
|00000210| 22 29 29 0a 0a 28 6f 72 | 20 28 62 6f 75 6e 64 70 |"))..(or| (boundp|
|00000220| 20 27 63 75 72 72 65 6e | 74 2d 6c 6f 61 64 2d 6c | 'curren|t-load-l|
|00000230| 69 73 74 29 20 28 73 65 | 74 71 20 63 75 72 72 65 |ist) (se|tq curre|
|00000240| 6e 74 2d 6c 6f 61 64 2d | 6c 69 73 74 20 6e 69 6c |nt-load-|list nil|
|00000250| 29 29 0a 0a 0a 23 40 39 | 39 20 4e 6f 6e 2d 6e 69 |))...#@9|9 Non-ni|
|00000260| 6c 20 69 66 20 74 68 69 | 73 20 69 73 20 58 45 6d |l if thi|s is XEm|
|00000270| 61 63 73 2e 20 20 44 6f | 6e 27 74 20 61 6c 74 65 |acs. Do|n't alte|
|00000280| 72 20 6d 61 6e 75 61 6c | 6c 79 2c 20 62 65 63 61 |r manual|ly, beca|
|00000290| 75 73 65 20 69 74 20 61 | 6c 73 6f 0a 74 75 72 6e |use it a|lso.turn|
|000002a0| 73 20 6f 6e 20 77 6f 72 | 6b 2d 61 72 6f 75 6e 64 |s on wor|k-around|
|000002b0| 73 20 66 6f 72 20 62 75 | 67 73 2e 1f 0a 28 64 65 |s for bu|gs...(de|
|000002c0| 66 63 6f 6e 73 74 20 65 | 6d 65 72 67 65 2d 78 65 |fconst e|merge-xe|
|000002d0| 6d 61 63 73 2d 70 20 28 | 62 79 74 65 2d 63 6f 64 |macs-p (|byte-cod|
|000002e0| 65 20 22 c0 c1 5c 6e 5c | 22 3f 3f 87 22 20 5b 73 |e "..\n\|"??." [s|
|000002f0| 74 72 69 6e 67 2d 6d 61 | 74 63 68 20 22 58 45 6d |tring-ma|tch "XEm|
|00000300| 61 63 73 22 20 65 6d 61 | 63 73 2d 76 65 72 73 69 |acs" ema|cs-versi|
|00000310| 6f 6e 5d 20 33 29 20 28 | 23 24 20 2e 20 36 30 32 |on] 3) (|#$ . 602|
|00000320| 29 29 0a 23 40 32 37 34 | 20 44 65 66 69 6e 65 73 |)).#@274| Defines|
|00000330| 20 53 59 4d 42 4f 4c 20 | 61 73 20 61 6e 20 61 64 | SYMBOL |as an ad|
|00000340| 76 65 72 74 69 73 65 64 | 20 76 61 72 69 61 62 6c |vertised| variabl|
|00000350| 65 2e 0a 50 65 72 66 6f | 72 6d 73 20 61 20 64 65 |e..Perfo|rms a de|
|00000360| 66 76 61 72 2c 20 74 68 | 65 6e 20 65 78 65 63 75 |fvar, th|en execu|
|00000370| 74 65 73 20 60 6d 61 6b | 65 2d 76 61 72 69 61 62 |tes `mak|e-variab|
|00000380| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 27 |le-buffe|r-local'|
|00000390| 20 6f 6e 0a 74 68 65 20 | 76 61 72 69 61 62 6c 65 | on.the |variable|
|000003a0| 2e 20 20 41 6c 73 6f 20 | 73 65 74 73 20 74 68 65 |. Also |sets the|
|000003b0| 20 60 70 72 65 73 65 72 | 76 65 64 27 20 70 72 6f | `preser|ved' pro|
|000003c0| 70 65 72 74 79 2c 20 73 | 6f 20 74 68 61 74 0a 60 |perty, s|o that.`|
|000003d0| 6b 69 6c 6c 2d 61 6c 6c | 2d 6c 6f 63 61 6c 2d 76 |kill-all|-local-v|
|000003e0| 61 72 69 61 62 6c 65 73 | 27 20 28 63 61 6c 6c 65 |ariables|' (calle|
|000003f0| 64 20 62 79 20 6d 61 6a | 6f 72 2d 6d 6f 64 65 20 |d by maj|or-mode |
|00000400| 73 65 74 74 69 6e 67 20 | 63 6f 6d 6d 61 6e 64 73 |setting |commands|
|00000410| 29 0a 77 6f 6e 27 74 20 | 64 65 73 74 72 6f 79 20 |).won't |destroy |
|00000420| 45 6d 65 72 67 65 20 63 | 6f 6e 74 72 6f 6c 20 76 |Emerge c|ontrol v|
|00000430| 61 72 69 61 62 6c 65 73 | 2e 1f 0a 28 64 65 66 61 |ariables|...(defa|
|00000440| 6c 69 61 73 20 27 65 6d | 65 72 67 65 2d 64 65 66 |lias 'em|erge-def|
|00000450| 76 61 72 2d 6c 6f 63 61 | 6c 20 27 28 6d 61 63 72 |var-loca|l '(macr|
|00000460| 6f 20 2e 20 23 5b 28 76 | 61 72 20 76 61 6c 75 65 |o . #[(v|ar value|
|00000470| 20 64 6f 63 29 20 22 c0 | c1 5c 6e 0b 0c 46 c5 c6 | doc) ".|.\n..F..|
|00000480| 5c 6e 44 44 c7 c6 5c 6e | 44 c8 42 42 46 87 22 20 |\nDD..\n|D.BBF." |
|00000490| 5b 70 72 6f 67 6e 20 64 | 65 66 76 61 72 20 76 61 |[progn d|efvar va|
|000004a0| 72 20 76 61 6c 75 65 20 | 64 6f 63 20 6d 61 6b 65 |r value |doc make|
|000004b0| 2d 76 61 72 69 61 62 6c | 65 2d 62 75 66 66 65 72 |-variabl|e-buffer|
|000004c0| 2d 6c 6f 63 61 6c 20 71 | 75 6f 74 65 20 70 75 74 |-local q|uote put|
|000004d0| 20 28 28 69 66 20 65 6d | 65 72 67 65 2d 78 65 6d | ((if em|erge-xem|
|000004e0| 61 63 73 2d 70 20 27 70 | 65 72 6d 61 6e 65 6e 74 |acs-p 'p|ermanent|
|000004f0| 2d 6c 6f 63 61 6c 20 27 | 70 72 65 73 65 72 76 65 |-local '|preserve|
|00000500| 64 29 20 74 29 5d 20 36 | 20 28 23 24 20 2e 20 38 |d) t)] 6| (#$ . 8|
|00000510| 30 39 29 5d 29 29 0a 28 | 62 79 74 65 2d 63 6f 64 |09)])).(|byte-cod|
|00000520| 65 20 22 c0 c1 21 ac 82 | c2 11 c1 0b 42 13 c4 0d |e "..!..|....B...|
|00000530| b7 ac 85 c6 09 0d 5c 22 | 15 c0 87 22 20 5b 62 6f |......\"|..." [bo|
|00000540| 75 6e 64 70 20 65 6d 65 | 72 67 65 2d 6d 69 6e 6f |undp eme|rge-mino|
|00000550| 72 2d 6d 6f 64 65 73 2d | 6c 69 73 74 20 28 28 65 |r-modes-|list ((e|
|00000560| 6d 65 72 67 65 2d 6d 6f | 64 65 20 22 20 45 6d 65 |merge-mo|de " Eme|
|00000570| 72 67 65 22 29 20 28 65 | 6d 65 72 67 65 2d 66 61 |rge") (e|merge-fa|
|00000580| 73 74 2d 6d 6f 64 65 20 | 22 20 46 22 29 20 28 65 |st-mode |" F") (e|
|00000590| 6d 65 72 67 65 2d 65 64 | 69 74 2d 6d 6f 64 65 20 |merge-ed|it-mode |
|000005a0| 22 20 45 22 29 20 28 65 | 6d 65 72 67 65 2d 61 75 |" E") (e|merge-au|
|000005b0| 74 6f 2d 61 64 76 61 6e | 63 65 20 22 20 41 22 29 |to-advan|ce " A")|
|000005c0| 20 28 65 6d 65 72 67 65 | 2d 73 6b 69 70 2d 70 72 | (emerge|-skip-pr|
|000005d0| 65 66 65 72 73 20 22 20 | 53 22 29 29 20 63 75 72 |efers " |S")) cur|
|000005e0| 72 65 6e 74 2d 6c 6f 61 | 64 2d 6c 69 73 74 20 65 |rent-loa|d-list e|
|000005f0| 6d 65 72 67 65 2d 6d 6f | 64 65 20 6d 69 6e 6f 72 |merge-mo|de minor|
|00000600| 2d 6d 6f 64 65 2d 61 6c | 69 73 74 20 61 70 70 65 |-mode-al|ist appe|
|00000610| 6e 64 5d 20 33 29 0a 23 | 40 34 39 31 20 45 6d 65 |nd] 3).#|@491 Eme|
|00000620| 72 67 65 20 6d 6f 64 65 | 20 69 73 20 75 73 65 64 |rge mode| is used|
|00000630| 20 62 79 20 74 68 65 20 | 45 6d 65 72 67 65 20 66 | by the |Emerge f|
|00000640| 69 6c 65 2d 6d 65 72 67 | 69 6e 67 20 70 61 63 6b |ile-merg|ing pack|
|00000650| 61 67 65 2e 0a 49 74 20 | 69 73 20 65 6e 74 65 72 |age..It |is enter|
|00000660| 65 64 20 6f 6e 6c 79 20 | 74 68 72 6f 75 67 68 20 |ed only |through |
|00000670| 6f 6e 65 20 6f 66 20 74 | 68 65 20 66 75 6e 63 74 |one of t|he funct|
|00000680| 69 6f 6e 73 3a 0a 09 60 | 65 6d 65 72 67 65 2d 66 |ions:..`|emerge-f|
|00000690| 69 6c 65 73 27 0a 09 60 | 65 6d 65 72 67 65 2d 66 |iles'..`|emerge-f|
|000006a0| 69 6c 65 73 2d 77 69 74 | 68 2d 61 6e 63 65 73 74 |iles-wit|h-ancest|
|000006b0| 6f 72 27 0a 09 60 65 6d | 65 72 67 65 2d 62 75 66 |or'..`em|erge-buf|
|000006c0| 66 65 72 73 27 0a 09 60 | 65 6d 65 72 67 65 2d 62 |fers'..`|emerge-b|
|000006d0| 75 66 66 65 72 73 2d 77 | 69 74 68 2d 61 6e 63 65 |uffers-w|ith-ance|
|000006e0| 73 74 6f 72 27 0a 09 60 | 65 6d 65 72 67 65 2d 66 |stor'..`|emerge-f|
|000006f0| 69 6c 65 73 2d 63 6f 6d | 6d 61 6e 64 27 0a 09 60 |iles-com|mand'..`|
|00000700| 65 6d 65 72 67 65 2d 66 | 69 6c 65 73 2d 77 69 74 |emerge-f|iles-wit|
|00000710| 68 2d 61 6e 63 65 73 74 | 6f 72 2d 63 6f 6d 6d 61 |h-ancest|or-comma|
|00000720| 6e 64 27 0a 09 60 65 6d | 65 72 67 65 2d 66 69 6c |nd'..`em|erge-fil|
|00000730| 65 73 2d 72 65 6d 6f 74 | 65 27 0a 09 60 65 6d 65 |es-remot|e'..`eme|
|00000740| 72 67 65 2d 66 69 6c 65 | 73 2d 77 69 74 68 2d 61 |rge-file|s-with-a|
|00000750| 6e 63 65 73 74 6f 72 2d | 72 65 6d 6f 74 65 27 0a |ncestor-|remote'.|
|00000760| 0a 43 6f 6d 6d 61 6e 64 | 73 3a 0a 5c 7b 65 6d 65 |.Command|s:.\{eme|
|00000770| 72 67 65 2d 62 61 73 69 | 63 2d 6b 65 79 6d 61 70 |rge-basi|c-keymap|
|00000780| 7d 0a 43 6f 6d 6d 61 6e | 64 73 20 6d 75 73 74 20 |}.Comman|ds must |
|00000790| 62 65 20 70 72 65 66 69 | 78 65 64 20 62 79 20 5c |be prefi|xed by \|
|000007a0| 3c 65 6d 65 72 67 65 2d | 66 61 73 74 2d 6b 65 79 |<emerge-|fast-key|
|000007b0| 6d 61 70 3e 5c 5b 65 6d | 65 72 67 65 2d 62 61 73 |map>\[em|erge-bas|
|000007c0| 69 63 2d 6b 65 79 6d 61 | 70 5d 20 69 6e 20 60 65 |ic-keyma|p] in `e|
|000007d0| 64 69 74 27 20 6d 6f 64 | 65 2c 0a 62 75 74 20 63 |dit' mod|e,.but c|
|000007e0| 61 6e 20 62 65 20 69 6e | 76 6f 6b 65 64 20 64 69 |an be in|voked di|
|000007f0| 72 65 63 74 6c 79 20 69 | 6e 20 60 66 61 73 74 27 |rectly i|n `fast'|
|00000800| 20 6d 6f 64 65 2e 1f 0a | 28 64 65 66 61 6c 69 61 | mode...|(defalia|
|00000810| 73 20 27 65 6d 65 72 67 | 65 2d 6d 6f 64 65 20 23 |s 'emerg|e-mode #|
|00000820| 5b 6e 69 6c 20 22 c0 87 | 22 20 5b 6e 69 6c 5d 20 |[nil "..|" [nil] |
|00000830| 31 20 28 23 24 20 2e 20 | 31 35 36 35 29 5d 29 0a |1 (#$ . |1565)]).|
|00000840| 23 40 32 34 20 54 68 65 | 20 76 65 72 73 69 6f 6e |#@24 The| version|
|00000850| 20 6f 66 20 45 6d 65 72 | 67 65 2e 1f 0a 28 64 65 | of Emer|ge...(de|
|00000860| 66 76 61 72 20 65 6d 65 | 72 67 65 2d 76 65 72 73 |fvar eme|rge-vers|
|00000870| 69 6f 6e 20 22 35 78 65 | 6d 61 63 73 22 20 28 23 |ion "5xe|macs" (#|
|00000880| 24 20 2e 20 32 31 31 37 | 29 29 0a 23 40 39 38 20 |$ . 2117|)).#@98 |
|00000890| 52 65 74 75 72 6e 20 73 | 74 72 69 6e 67 20 64 65 |Return s|tring de|
|000008a0| 73 63 72 69 62 69 6e 67 | 20 74 68 65 20 76 65 72 |scribing| the ver|
|000008b0| 73 69 6f 6e 20 6f 66 20 | 45 6d 65 72 67 65 2e 0a |sion of |Emerge..|
|000008c0| 57 68 65 6e 20 63 61 6c | 6c 65 64 20 69 6e 74 65 |When cal|led inte|
|000008d0| 72 61 63 74 69 76 65 6c | 79 2c 20 64 69 73 70 6c |ractivel|y, displ|
|000008e0| 61 79 73 20 74 68 65 20 | 76 65 72 73 69 6f 6e 2e |ays the |version.|
|000008f0| 1f 0a 28 64 65 66 61 6c | 69 61 73 20 27 65 6d 65 |..(defal|ias 'eme|
|00000900| 72 67 65 2d 76 65 72 73 | 69 6f 6e 20 23 5b 6e 69 |rge-vers|ion #[ni|
|00000910| 6c 20 22 74 ab 86 c0 c1 | c2 20 5c 22 87 5c 6e 87 |l "t....|. \".\n.|
|00000920| 22 20 5b 6d 65 73 73 61 | 67 65 20 22 45 6d 65 72 |" [messa|ge "Emer|
|00000930| 67 65 20 76 65 72 73 69 | 6f 6e 20 25 73 22 20 65 |ge versi|on %s" e|
|00000940| 6d 65 72 67 65 2d 76 65 | 72 73 69 6f 6e 5d 20 33 |merge-ve|rsion] 3|
|00000950| 20 28 23 24 20 2e 20 32 | 31 39 32 29 20 6e 69 6c | (#$ . 2|192) nil|
|00000960| 5d 29 0a 23 40 34 38 20 | 2a 4e 61 6d 65 20 6f 66 |]).#@48 |*Name of|
|00000970| 20 74 68 65 20 70 72 6f | 67 72 61 6d 20 77 68 69 | the pro|gram whi|
|00000980| 63 68 20 63 6f 6d 70 61 | 72 65 73 20 74 77 6f 20 |ch compa|res two |
|00000990| 66 69 6c 65 73 2e 1f 0a | 28 64 65 66 76 61 72 20 |files...|(defvar |
|000009a0| 65 6d 65 72 67 65 2d 64 | 69 66 66 2d 70 72 6f 67 |emerge-d|iff-prog|
|000009b0| 72 61 6d 20 22 64 69 66 | 66 22 20 28 23 24 20 2e |ram "dif|f" (#$ .|
|000009c0| 20 2d 32 34 30 38 29 29 | 0a 23 40 31 31 33 20 2a | -2408))|.#@113 *|
|000009d0| 4e 61 6d 65 20 6f 66 20 | 74 68 65 20 70 72 6f 67 |Name of |the prog|
|000009e0| 72 61 6d 20 77 68 69 63 | 68 20 63 6f 6d 70 61 72 |ram whic|h compar|
|000009f0| 65 73 20 74 68 72 65 65 | 20 66 69 6c 65 73 2e 0a |es three| files..|
|00000a00| 49 74 73 20 61 72 67 75 | 6d 65 6e 74 73 20 61 72 |Its argu|ments ar|
|00000a10| 65 20 74 68 65 20 61 6e | 63 65 73 74 6f 72 20 66 |e the an|cestor f|
|00000a20| 69 6c 65 20 61 6e 64 20 | 74 68 65 20 74 77 6f 20 |ile and |the two |
|00000a30| 76 61 72 69 61 6e 74 20 | 66 69 6c 65 73 2e 1f 0a |variant |files...|
|00000a40| 28 64 65 66 76 61 72 20 | 65 6d 65 72 67 65 2d 64 |(defvar |emerge-d|
|00000a50| 69 66 66 33 2d 70 72 6f | 67 72 61 6d 20 22 64 69 |iff3-pro|gram "di|
|00000a60| 66 66 33 22 20 28 23 24 | 20 2e 20 2d 32 35 31 31 |ff3" (#$| . -2511|
|00000a70| 29 29 0a 23 40 37 31 20 | 2a 4f 70 74 69 6f 6e 73 |)).#@71 |*Options|
|00000a80| 20 74 6f 20 70 61 73 73 | 20 74 6f 20 60 65 6d 65 | to pass| to `eme|
|00000a90| 72 67 65 2d 64 69 66 66 | 2d 70 72 6f 67 72 61 6d |rge-diff|-program|
|00000aa0| 27 20 61 6e 64 20 60 65 | 6d 65 72 67 65 2d 64 69 |' and `e|merge-di|
|00000ab0| 66 66 33 2d 70 72 6f 67 | 72 61 6d 27 2e 1f 0a 28 |ff3-prog|ram'...(|
|00000ac0| 64 65 66 76 61 72 20 65 | 6d 65 72 67 65 2d 64 69 |defvar e|merge-di|
|00000ad0| 66 66 2d 6f 70 74 69 6f | 6e 73 20 22 22 20 28 23 |ff-optio|ns "" (#|
|00000ae0| 24 20 2e 20 2d 32 36 38 | 30 29 29 0a 23 40 31 32 |$ . -268|0)).#@12|
|00000af0| 30 20 2a 50 61 74 74 65 | 72 6e 20 74 6f 20 6d 61 |0 *Patte|rn to ma|
|00000b00| 74 63 68 20 6c 69 6e 65 | 73 20 70 72 6f 64 75 63 |tch line|s produc|
|00000b10| 65 64 20 62 79 20 64 69 | 66 66 20 74 68 61 74 20 |ed by di|ff that |
|00000b20| 64 65 73 63 72 69 62 65 | 20 64 69 66 66 65 72 65 |describe| differe|
|00000b30| 6e 63 65 73 2e 0a 54 68 | 69 73 20 69 73 20 61 73 |nces..Th|is is as|
|00000b40| 20 6f 70 70 6f 73 65 64 | 20 74 6f 20 6c 69 6e 65 | opposed| to line|
|00000b50| 73 20 66 72 6f 6d 20 74 | 68 65 20 73 6f 75 72 63 |s from t|he sourc|
|00000b60| 65 20 66 69 6c 65 73 2e | 1f 0a 28 64 65 66 76 61 |e files.|..(defva|
|00000b70| 72 20 65 6d 65 72 67 65 | 2d 6d 61 74 63 68 2d 64 |r emerge|-match-d|
|00000b80| 69 66 66 2d 6c 69 6e 65 | 20 28 62 79 74 65 2d 63 |iff-line| (byte-c|
|00000b90| 6f 64 65 20 22 c0 19 c2 | 09 c3 09 c4 b0 05 29 87 |ode "...|......).|
|00000ba0| 22 20 5b 22 5c 5c 28 5b | 30 2d 39 5d 2b 5c 5c 29 |" ["\\([|0-9]+\\)|
|00000bb0| 5c 5c 28 5c 5c 7c 2c 5c | 5c 28 5b 30 2d 39 5d 2b |\\(\\|,\|\([0-9]+|
|00000bc0| 5c 5c 29 5c 5c 29 22 20 | 78 20 22 5e 22 20 22 5c |\\)\\)" |x "^" "\|
|00000bd0| 5c 28 5b 61 63 64 5d 5c | 5c 29 22 20 22 24 22 5d |\([acd]\|\)" "$"]|
|00000be0| 20 35 29 20 28 23 24 20 | 2e 20 2d 32 38 30 32 29 | 5) (#$ |. -2802)|
|00000bf0| 29 0a 23 40 31 32 38 20 | 2a 52 65 67 65 78 70 20 |).#@128 |*Regexp |
|00000c00| 74 68 61 74 20 6d 61 74 | 63 68 65 73 20 6e 6f 72 |that mat|ches nor|
|00000c10| 6d 61 6c 20 6f 75 74 70 | 75 74 20 6c 69 6e 65 73 |mal outp|ut lines|
|00000c20| 20 66 72 6f 6d 20 60 65 | 6d 65 72 67 65 2d 64 69 | from `e|merge-di|
|00000c30| 66 66 2d 70 72 6f 67 72 | 61 6d 27 2e 0a 4c 69 6e |ff-progr|am'..Lin|
|00000c40| 65 73 20 74 68 61 74 20 | 64 6f 20 6e 6f 74 20 6d |es that |do not m|
|00000c50| 61 74 63 68 20 61 72 65 | 20 61 73 73 75 6d 65 64 |atch are| assumed|
|00000c60| 20 74 6f 20 62 65 20 65 | 72 72 6f 72 20 6d 65 73 | to be e|rror mes|
|00000c70| 73 61 67 65 73 2e 1f 0a | 28 64 65 66 76 61 72 20 |sages...|(defvar |
|00000c80| 65 6d 65 72 67 65 2d 64 | 69 66 66 2d 6f 6b 2d 6c |emerge-d|iff-ok-l|
|00000c90| 69 6e 65 73 2d 72 65 67 | 65 78 70 20 22 5e 5c 5c |ines-reg|exp "^\\|
|00000ca0| 28 5b 30 2d 39 2c 5d 2b | 5b 61 63 64 5d 5b 30 2d |([0-9,]+|[acd][0-|
|00000cb0| 39 2c 5d 2b 24 5c 5c 7c | 5b 3c 3e 5d 20 5c 5c 7c |9,]+$\\||[<>] \\||
|00000cc0| 2d 2d 2d 5c 5c 29 22 20 | 28 23 24 20 2e 20 2d 33 |---\\)" |(#$ . -3|
|00000cd0| 30 36 34 29 29 0a 23 40 | 31 32 39 20 2a 52 65 67 |064)).#@|129 *Reg|
|00000ce0| 65 78 70 20 74 68 61 74 | 20 6d 61 74 63 68 65 73 |exp that| matches|
|00000cf0| 20 6e 6f 72 6d 61 6c 20 | 6f 75 74 70 75 74 20 6c | normal |output l|
|00000d00| 69 6e 65 73 20 66 72 6f | 6d 20 60 65 6d 65 72 67 |ines fro|m `emerg|
|00000d10| 65 2d 64 69 66 66 33 2d | 70 72 6f 67 72 61 6d 27 |e-diff3-|program'|
|00000d20| 2e 0a 4c 69 6e 65 73 20 | 74 68 61 74 20 64 6f 20 |..Lines |that do |
|00000d30| 6e 6f 74 20 6d 61 74 63 | 68 20 61 72 65 20 61 73 |not matc|h are as|
|00000d40| 73 75 6d 65 64 20 74 6f | 20 62 65 20 65 72 72 6f |sumed to| be erro|
|00000d50| 72 20 6d 65 73 73 61 67 | 65 73 2e 1f 0a 28 64 65 |r messag|es...(de|
|00000d60| 66 76 61 72 20 65 6d 65 | 72 67 65 2d 64 69 66 66 |fvar eme|rge-diff|
|00000d70| 33 2d 6f 6b 2d 6c 69 6e | 65 73 2d 72 65 67 65 78 |3-ok-lin|es-regex|
|00000d80| 70 20 22 5e 5c 5c 28 5b | 31 2d 33 5d 3a 5c 5c 7c |p "^\\([|1-3]:\\||
|00000d90| 3d 3d 3d 3d 5c 5c 7c 20 | 20 5c 5c 29 22 20 28 23 |====\\| | \\)" (#|
|00000da0| 24 20 2e 20 2d 33 32 39 | 32 29 29 0a 23 40 35 32 |$ . -329|2)).#@52|
|00000db0| 20 2a 4e 61 6d 65 20 6f | 66 20 74 68 65 20 70 72 | *Name o|f the pr|
|00000dc0| 6f 67 72 61 6d 20 74 68 | 61 74 20 63 68 65 63 6b |ogram th|at check|
|00000dd0| 73 20 69 6e 20 52 43 53 | 20 72 65 76 69 73 69 6f |s in RCS| revisio|
|00000de0| 6e 73 2e 1f 0a 28 64 65 | 66 76 61 72 20 65 6d 65 |ns...(de|fvar eme|
|00000df0| 72 67 65 2d 72 63 73 2d | 63 69 2d 70 72 6f 67 72 |rge-rcs-|ci-progr|
|00000e00| 61 6d 20 22 63 69 22 20 | 28 23 24 20 2e 20 2d 33 |am "ci" |(#$ . -3|
|00000e10| 35 30 35 29 29 0a 23 40 | 35 33 20 2a 4e 61 6d 65 |505)).#@|53 *Name|
|00000e20| 20 6f 66 20 74 68 65 20 | 70 72 6f 67 72 61 6d 20 | of the |program |
|00000e30| 74 68 61 74 20 63 68 65 | 63 6b 73 20 6f 75 74 20 |that che|cks out |
|00000e40| 52 43 53 20 72 65 76 69 | 73 69 6f 6e 73 2e 1f 0a |RCS revi|sions...|
|00000e50| 28 64 65 66 76 61 72 20 | 65 6d 65 72 67 65 2d 72 |(defvar |emerge-r|
|00000e60| 63 73 2d 63 6f 2d 70 72 | 6f 67 72 61 6d 20 22 63 |cs-co-pr|ogram "c|
|00000e70| 6f 22 20 28 23 24 20 2e | 20 2d 33 36 31 31 29 29 |o" (#$ .| -3611))|
|00000e80| 0a 23 40 31 37 34 20 2a | 4e 6f 6e 2d 6e 69 6c 20 |.#@174 *|Non-nil |
|00000e90| 69 66 20 45 6d 65 72 67 | 65 20 73 68 6f 75 6c 64 |if Emerg|e should|
|00000ea0| 20 70 72 6f 63 65 73 73 | 20 6c 6f 63 61 6c 2d 76 | process| local-v|
|00000eb0| 61 72 69 61 62 6c 65 73 | 20 6c 69 73 74 73 20 69 |ariables| lists i|
|00000ec0| 6e 20 6d 65 72 67 65 20 | 62 75 66 66 65 72 73 2e |n merge |buffers.|
|00000ed0| 0a 28 59 6f 75 20 63 61 | 6e 20 65 78 70 6c 69 63 |.(You ca|n explic|
|00000ee0| 69 74 6c 79 20 72 65 71 | 75 65 73 74 20 70 72 6f |itly req|uest pro|
|00000ef0| 63 65 73 73 69 6e 67 20 | 74 68 65 20 6c 6f 63 61 |cessing |the loca|
|00000f00| 6c 2d 76 61 72 69 61 62 | 6c 65 73 0a 62 79 20 65 |l-variab|les.by e|
|00000f10| 78 65 63 75 74 69 6e 67 | 20 60 28 68 61 63 6b 2d |xecuting| `(hack-|
|00000f20| 6c 6f 63 61 6c 2d 76 61 | 72 69 61 62 6c 65 73 29 |local-va|riables)|
|00000f30| 27 2e 29 1f 0a 28 64 65 | 66 76 61 72 20 65 6d 65 |'.)..(de|fvar eme|
|00000f40| 72 67 65 2d 70 72 6f 63 | 65 73 73 2d 6c 6f 63 61 |rge-proc|ess-loca|
|00000f50| 6c 2d 76 61 72 69 61 62 | 6c 65 73 20 6e 69 6c 20 |l-variab|les nil |
|00000f60| 28 23 24 20 2e 20 2d 33 | 37 31 39 29 29 0a 23 40 |(#$ . -3|719)).#@|
|00000f70| 33 33 39 20 2a 49 66 20 | 6e 6f 6e 2d 6e 69 6c 3a |339 *If |non-nil:|
|00000f80| 20 60 65 6d 65 72 67 65 | 2d 65 78 65 63 75 74 65 | `emerge|-execute|
|00000f90| 2d 6c 69 6e 65 27 20 6d | 61 6b 65 73 20 6e 6f 20 |-line' m|akes no |
|00000fa0| 6f 75 74 70 75 74 20 69 | 66 20 61 6e 20 69 6e 70 |output i|f an inp|
|00000fb0| 75 74 20 77 61 73 20 64 | 65 6c 65 74 65 64 2e 0a |ut was d|eleted..|
|00000fc0| 49 74 20 63 6f 6e 63 6c | 75 64 65 73 20 74 68 61 |It concl|udes tha|
|00000fd0| 74 20 61 6e 20 69 6e 70 | 75 74 20 76 65 72 73 69 |t an inp|ut versi|
|00000fe0| 6f 6e 20 68 61 73 20 62 | 65 65 6e 20 64 65 6c 65 |on has b|een dele|
|00000ff0| 74 65 64 20 77 68 65 6e | 20 61 6e 20 61 6e 63 65 |ted when| an ance|
|00001000| 73 74 6f 72 20 65 6e 74 | 72 79 0a 69 73 20 70 72 |stor ent|ry.is pr|
|00001010| 65 73 65 6e 74 2c 20 6f | 6e 6c 79 20 6f 6e 65 20 |esent, o|nly one |
|00001020| 41 20 6f 72 20 42 20 65 | 6e 74 72 79 20 69 73 20 |A or B e|ntry is |
|00001030| 70 72 65 73 65 6e 74 2c | 20 61 6e 64 20 61 6e 20 |present,| and an |
|00001040| 6f 75 74 70 75 74 20 65 | 6e 74 72 79 20 69 73 20 |output e|ntry is |
|00001050| 70 72 65 73 65 6e 74 2e | 0a 49 66 20 6e 69 6c 3a |present.|.If nil:|
|00001060| 20 49 6e 20 73 75 63 68 | 20 63 69 72 63 75 6d 73 | In such| circums|
|00001070| 74 61 6e 63 65 73 2c 20 | 74 68 65 20 41 20 6f 72 |tances, |the A or|
|00001080| 20 42 20 66 69 6c 65 20 | 74 68 61 74 20 69 73 20 | B file |that is |
|00001090| 70 72 65 73 65 6e 74 20 | 77 69 6c 6c 20 62 65 0a |present |will be.|
|000010a0| 63 6f 70 69 65 64 20 74 | 6f 20 74 68 65 20 64 65 |copied t|o the de|
|000010b0| 73 69 67 6e 61 74 65 64 | 20 6f 75 74 70 75 74 20 |signated| output |
|000010c0| 66 69 6c 65 2e 1f 0a 28 | 64 65 66 76 61 72 20 65 |file...(|defvar e|
|000010d0| 6d 65 72 67 65 2d 65 78 | 65 63 75 74 65 2d 6c 69 |merge-ex|ecute-li|
|000010e0| 6e 65 2d 64 65 6c 65 74 | 69 6f 6e 73 20 6e 69 6c |ne-delet|ions nil|
|000010f0| 20 28 23 24 20 2e 20 2d | 33 39 35 36 29 29 0a 23 | (#$ . -|3956)).#|
|00001100| 40 31 36 31 20 2a 46 6c | 61 67 20 70 6c 61 63 65 |@161 *Fl|ag place|
|00001110| 64 20 61 62 6f 76 65 20 | 74 68 65 20 68 69 67 68 |d above |the high|
|00001120| 6c 69 67 68 74 65 64 20 | 62 6c 6f 63 6b 20 6f 66 |lighted |block of|
|00001130| 20 63 6f 64 65 2e 20 20 | 4d 75 73 74 20 65 6e 64 | code. |Must end|
|00001140| 20 77 69 74 68 20 6e 65 | 77 6c 69 6e 65 2e 0a 4d | with ne|wline..M|
|00001150| 75 73 74 20 62 65 20 73 | 65 74 20 62 65 66 6f 72 |ust be s|et befor|
|00001160| 65 20 45 6d 65 72 67 65 | 20 69 73 20 6c 6f 61 64 |e Emerge| is load|
|00001170| 65 64 2c 20 6f 72 20 20 | 65 6d 65 72 67 65 2d 6e |ed, or |emerge-n|
|00001180| 65 77 2d 66 6c 61 67 73 | 20 20 6d 75 73 74 20 62 |ew-flags| must b|
|00001190| 65 20 72 75 6e 0a 61 66 | 74 65 72 20 73 65 74 74 |e run.af|ter sett|
|000011a0| 69 6e 67 2e 1f 0a 28 64 | 65 66 76 61 72 20 65 6d |ing...(d|efvar em|
|000011b0| 65 72 67 65 2d 62 65 66 | 6f 72 65 2d 66 6c 61 67 |erge-bef|ore-flag|
|000011c0| 20 22 76 76 76 76 76 76 | 76 76 76 76 76 76 76 76 | "vvvvvv|vvvvvvvv|
|000011d0| 76 76 76 76 76 76 5c 6e | 22 20 28 23 24 20 2e 20 |vvvvvv\n|" (#$ . |
|000011e0| 2d 34 33 35 37 29 29 0a | 23 40 31 36 31 20 2a 46 |-4357)).|#@161 *F|
|000011f0| 6c 61 67 20 70 6c 61 63 | 65 64 20 62 65 6c 6f 77 |lag plac|ed below|
|00001200| 20 74 68 65 20 68 69 67 | 68 6c 69 67 68 74 65 64 | the hig|hlighted|
|00001210| 20 62 6c 6f 63 6b 20 6f | 66 20 63 6f 64 65 2e 20 | block o|f code. |
|00001220| 20 4d 75 73 74 20 65 6e | 64 20 77 69 74 68 20 6e | Must en|d with n|
|00001230| 65 77 6c 69 6e 65 2e 0a | 4d 75 73 74 20 62 65 20 |ewline..|Must be |
|00001240| 73 65 74 20 62 65 66 6f | 72 65 20 45 6d 65 72 67 |set befo|re Emerg|
|00001250| 65 20 69 73 20 6c 6f 61 | 64 65 64 2c 20 6f 72 20 |e is loa|ded, or |
|00001260| 20 65 6d 65 72 67 65 2d | 6e 65 77 2d 66 6c 61 67 | emerge-|new-flag|
|00001270| 73 20 20 6d 75 73 74 20 | 62 65 20 72 75 6e 0a 61 |s must |be run.a|
|00001280| 66 74 65 72 20 73 65 74 | 74 69 6e 67 2e 1f 0a 28 |fter set|ting...(|
|00001290| 64 65 66 76 61 72 20 65 | 6d 65 72 67 65 2d 61 66 |defvar e|merge-af|
|000012a0| 74 65 72 2d 66 6c 61 67 | 20 22 5e 5e 5e 5e 5e 5e |ter-flag| "^^^^^^|
|000012b0| 5e 5e 5e 5e 5e 5e 5e 5e | 5e 5e 5e 5e 5e 5e 5c 6e |^^^^^^^^|^^^^^^\n|
|000012c0| 22 20 28 23 24 20 2e 20 | 2d 34 35 39 30 29 29 0a |" (#$ . |-4590)).|
|000012d0| 23 40 31 32 32 20 2a 46 | 6c 61 67 20 74 6f 20 63 |#@122 *F|lag to c|
|000012e0| 6f 6e 74 72 6f 6c 20 77 | 68 65 74 68 65 72 20 65 |ontrol w|hether e|
|000012f0| 6d 65 72 67 65 20 77 69 | 6c 6c 20 73 70 6c 69 74 |merge wi|ll split|
|00001300| 20 77 69 6e 64 6f 77 73 | 20 68 6f 72 69 7a 6f 6e | windows| horizon|
|00001310| 74 61 6c 6c 79 20 6f 72 | 20 6e 6f 74 2e 0a 4e 69 |tally or| not..Ni|
|00001320| 6c 20 6d 65 61 6e 73 20 | 74 68 61 74 20 77 69 6e |l means |that win|
|00001330| 64 6f 77 73 20 77 69 6c | 6c 20 62 65 20 73 70 6c |dows wil|l be spl|
|00001340| 69 74 20 76 65 72 74 69 | 63 61 6c 6c 79 2e 1f 0a |it verti|cally...|
|00001350| 28 64 65 66 76 61 72 20 | 65 6d 65 72 67 65 2d 73 |(defvar |emerge-s|
|00001360| 70 6c 69 74 2d 68 6f 72 | 69 7a 6f 6e 74 61 6c 6c |plit-hor|izontall|
|00001370| 79 20 74 20 28 23 24 20 | 2e 20 2d 34 38 32 32 29 |y t (#$ |. -4822)|
|00001380| 29 0a 23 40 36 37 20 2a | 48 6f 6f 6b 20 74 6f 20 |).#@67 *|Hook to |
|00001390| 72 75 6e 20 69 6e 20 74 | 68 65 20 6d 65 72 67 65 |run in t|he merge|
|000013a0| 20 62 75 66 66 65 72 20 | 61 66 74 65 72 20 74 68 | buffer |after th|
|000013b0| 65 20 6d 65 72 67 65 20 | 68 61 73 20 62 65 65 6e |e merge |has been|
|000013c0| 20 73 65 74 20 75 70 2e | 1f 0a 28 64 65 66 76 61 | set up.|..(defva|
|000013d0| 72 20 65 6d 65 72 67 65 | 2d 73 74 61 72 74 75 70 |r emerge|-startup|
|000013e0| 2d 68 6f 6f 6b 20 6e 69 | 6c 20 28 23 24 20 2e 20 |-hook ni|l (#$ . |
|000013f0| 2d 34 39 39 39 29 29 0a | 23 40 31 31 36 20 2a 48 |-4999)).|#@116 *H|
|00001400| 6f 6f 6b 20 74 6f 20 72 | 75 6e 20 61 66 74 65 72 |ook to r|un after|
|00001410| 20 61 20 64 69 66 66 65 | 72 65 6e 63 65 20 68 61 | a diffe|rence ha|
|00001420| 73 20 62 65 65 6e 20 73 | 65 6c 65 63 74 65 64 2e |s been s|elected.|
|00001430| 0a 54 68 65 20 76 61 72 | 69 61 62 6c 65 20 60 6e |.The var|iable `n|
|00001440| 27 20 68 6f 6c 64 73 20 | 74 68 65 20 28 69 6e 74 |' holds |the (int|
|00001450| 65 72 6e 61 6c 29 20 6e | 75 6d 62 65 72 20 6f 66 |ernal) n|umber of|
|00001460| 20 74 68 65 20 64 69 66 | 66 65 72 65 6e 63 65 2e | the dif|ference.|
|00001470| 1f 0a 28 64 65 66 76 61 | 72 20 65 6d 65 72 67 65 |..(defva|r emerge|
|00001480| 2d 73 65 6c 65 63 74 2d | 68 6f 6f 6b 20 6e 69 6c |-select-|hook nil|
|00001490| 20 28 23 24 20 2e 20 2d | 35 31 31 38 29 29 0a 23 | (#$ . -|5118)).#|
|000014a0| 40 31 31 38 20 2a 48 6f | 6f 6b 20 74 6f 20 72 75 |@118 *Ho|ok to ru|
|000014b0| 6e 20 61 66 74 65 72 20 | 61 20 64 69 66 66 65 72 |n after |a differ|
|000014c0| 65 6e 63 65 20 68 61 73 | 20 62 65 65 6e 20 75 6e |ence has| been un|
|000014d0| 73 65 6c 65 63 74 65 64 | 2e 0a 54 68 65 20 76 61 |selected|..The va|
|000014e0| 72 69 61 62 6c 65 20 60 | 6e 27 20 68 6f 6c 64 73 |riable `|n' holds|
|000014f0| 20 74 68 65 20 28 69 6e | 74 65 72 6e 61 6c 29 20 | the (in|ternal) |
|00001500| 6e 75 6d 62 65 72 20 6f | 66 20 74 68 65 20 64 69 |number o|f the di|
|00001510| 66 66 65 72 65 6e 63 65 | 2e 1f 0a 28 64 65 66 76 |fference|...(defv|
|00001520| 61 72 20 65 6d 65 72 67 | 65 2d 75 6e 73 65 6c 65 |ar emerg|e-unsele|
|00001530| 63 74 2d 68 6f 6f 6b 20 | 6e 69 6c 20 28 23 24 20 |ct-hook |nil (#$ |
|00001540| 2e 20 2d 35 32 38 35 29 | 29 0a 23 40 31 38 39 20 |. -5285)|).#@189 |
|00001550| 2a 49 66 20 6e 69 6c 2c | 20 64 65 66 61 75 6c 74 |*If nil,| default|
|00001560| 20 64 69 72 20 66 6f 72 | 20 66 69 6c 65 6e 61 6d | dir for| filenam|
|00001570| 65 73 20 69 6e 20 65 6d | 65 72 67 65 20 69 73 20 |es in em|erge is |
|00001580| 60 64 65 66 61 75 6c 74 | 2d 64 69 72 65 63 74 6f |`default|-directo|
|00001590| 72 79 27 2e 0a 49 66 20 | 6e 6f 6e 2d 6e 69 6c 2c |ry'..If |non-nil,|
|000015a0| 20 66 69 6c 65 6e 61 6d | 65 73 20 63 6f 6d 70 6c | filenam|es compl|
|000015b0| 65 74 65 20 69 6e 20 74 | 68 65 20 64 69 72 65 63 |ete in t|he direc|
|000015c0| 74 6f 72 79 20 6f 66 20 | 74 68 65 20 6c 61 73 74 |tory of |the last|
|000015d0| 20 61 72 67 75 6d 65 6e | 74 20 6f 66 20 74 68 65 | argumen|t of the|
|000015e0| 0a 73 61 6d 65 20 74 79 | 70 65 20 74 6f 20 61 6e |.same ty|pe to an|
|000015f0| 20 60 65 6d 65 72 67 65 | 2d 66 69 6c 65 73 2e 2e | `emerge|-files..|
|00001600| 2e 27 20 63 6f 6d 6d 61 | 6e 64 2e 1f 0a 28 64 65 |.' comma|nd...(de|
|00001610| 66 76 61 72 20 65 6d 65 | 72 67 65 2d 64 65 66 61 |fvar eme|rge-defa|
|00001620| 75 6c 74 2d 6c 61 73 74 | 2d 64 69 72 65 63 74 6f |ult-last|-directo|
|00001630| 72 69 65 73 20 6e 69 6c | 20 28 23 24 20 2e 20 2d |ries nil| (#$ . -|
|00001640| 35 34 35 36 29 29 0a 23 | 40 36 38 20 4c 61 73 74 |5456)).#|@68 Last|
|00001650| 20 64 69 72 65 63 74 6f | 72 79 20 66 6f 72 20 74 | directo|ry for t|
|00001660| 68 65 20 66 69 72 73 74 | 20 66 69 6c 65 20 6f 66 |he first| file of|
|00001670| 20 61 6e 20 60 65 6d 65 | 72 67 65 2d 66 69 6c 65 | an `eme|rge-file|
|00001680| 73 2e 2e 2e 27 20 63 6f | 6d 6d 61 6e 64 2e 1f 0a |s...' co|mmand...|
|00001690| 28 64 65 66 76 61 72 20 | 65 6d 65 72 67 65 2d 6c |(defvar |emerge-l|
|000016a0| 61 73 74 2d 64 69 72 2d | 41 20 6e 69 6c 20 28 23 |ast-dir-|A nil (#|
|000016b0| 24 20 2e 20 35 37 30 38 | 29 29 0a 23 40 36 39 20 |$ . 5708|)).#@69 |
|000016c0| 4c 61 73 74 20 64 69 72 | 65 63 74 6f 72 79 20 66 |Last dir|ectory f|
|000016d0| 6f 72 20 74 68 65 20 73 | 65 63 6f 6e 64 20 66 69 |or the s|econd fi|
|000016e0| 6c 65 20 6f 66 20 61 6e | 20 60 65 6d 65 72 67 65 |le of an| `emerge|
|000016f0| 2d 66 69 6c 65 73 2e 2e | 2e 27 20 63 6f 6d 6d 61 |-files..|.' comma|
|00001700| 6e 64 2e 1f 0a 28 64 65 | 66 76 61 72 20 65 6d 65 |nd...(de|fvar eme|
|00001710| 72 67 65 2d 6c 61 73 74 | 2d 64 69 72 2d 42 20 6e |rge-last|-dir-B n|
|00001720| 69 6c 20 28 23 24 20 2e | 20 35 38 32 34 29 29 0a |il (#$ .| 5824)).|
|00001730| 23 40 37 31 20 4c 61 73 | 74 20 64 69 72 65 63 74 |#@71 Las|t direct|
|00001740| 6f 72 79 20 66 6f 72 20 | 74 68 65 20 61 6e 63 65 |ory for |the ance|
|00001750| 73 74 6f 72 20 66 69 6c | 65 20 6f 66 20 61 6e 20 |stor fil|e of an |
|00001760| 60 65 6d 65 72 67 65 2d | 66 69 6c 65 73 2e 2e 2e |`emerge-|files...|
|00001770| 27 20 63 6f 6d 6d 61 6e | 64 2e 1f 0a 28 64 65 66 |' comman|d...(def|
|00001780| 76 61 72 20 65 6d 65 72 | 67 65 2d 6c 61 73 74 2d |var emer|ge-last-|
|00001790| 64 69 72 2d 61 6e 63 65 | 73 74 6f 72 20 6e 69 6c |dir-ance|stor nil|
|000017a0| 20 28 23 24 20 2e 20 35 | 39 34 31 29 29 0a 23 40 | (#$ . 5|941)).#@|
|000017b0| 36 39 20 4c 61 73 74 20 | 64 69 72 65 63 74 6f 72 |69 Last |director|
|000017c0| 79 20 66 6f 72 20 74 68 | 65 20 6f 75 74 70 75 74 |y for th|e output|
|000017d0| 20 66 69 6c 65 20 6f 66 | 20 61 6e 20 60 65 6d 65 | file of| an `eme|
|000017e0| 72 67 65 2d 66 69 6c 65 | 73 2e 2e 2e 27 20 63 6f |rge-file|s...' co|
|000017f0| 6d 6d 61 6e 64 2e 1f 0a | 28 64 65 66 76 61 72 20 |mmand...|(defvar |
|00001800| 65 6d 65 72 67 65 2d 6c | 61 73 74 2d 64 69 72 2d |emerge-l|ast-dir-|
|00001810| 6f 75 74 70 75 74 20 6e | 69 6c 20 28 23 24 20 2e |output n|il (#$ .|
|00001820| 20 36 30 36 37 29 29 0a | 23 40 37 36 20 4c 61 73 | 6067)).|#@76 Las|
|00001830| 74 20 52 43 53 20 72 65 | 76 69 73 69 6f 6e 20 75 |t RCS re|vision u|
|00001840| 73 65 64 20 66 6f 72 20 | 66 69 72 73 74 20 66 69 |sed for |first fi|
|00001850| 6c 65 20 6f 66 20 61 6e | 20 60 65 6d 65 72 67 65 |le of an| `emerge|
|00001860| 2d 72 65 76 69 73 69 6f | 6e 73 2e 2e 2e 27 20 63 |-revisio|ns...' c|
|00001870| 6f 6d 6d 61 6e 64 2e 1f | 0a 28 64 65 66 76 61 72 |ommand..|.(defvar|
|00001880| 20 65 6d 65 72 67 65 2d | 6c 61 73 74 2d 72 65 76 | emerge-|last-rev|
|00001890| 69 73 69 6f 6e 2d 41 20 | 6e 69 6c 20 28 23 24 20 |ision-A |nil (#$ |
|000018a0| 2e 20 36 31 38 39 29 29 | 0a 23 40 37 37 20 4c 61 |. 6189))|.#@77 La|
|000018b0| 73 74 20 52 43 53 20 72 | 65 76 69 73 69 6f 6e 20 |st RCS r|evision |
|000018c0| 75 73 65 64 20 66 6f 72 | 20 73 65 63 6f 6e 64 20 |used for| second |
|000018d0| 66 69 6c 65 20 6f 66 20 | 61 6e 20 60 65 6d 65 72 |file of |an `emer|
|000018e0| 67 65 2d 72 65 76 69 73 | 69 6f 6e 73 2e 2e 2e 27 |ge-revis|ions...'|
|000018f0| 20 63 6f 6d 6d 61 6e 64 | 2e 1f 0a 28 64 65 66 76 | command|...(defv|
|00001900| 61 72 20 65 6d 65 72 67 | 65 2d 6c 61 73 74 2d 72 |ar emerg|e-last-r|
|00001910| 65 76 69 73 69 6f 6e 2d | 42 20 6e 69 6c 20 28 23 |evision-|B nil (#|
|00001920| 24 20 2e 20 36 33 31 38 | 29 29 0a 23 40 37 39 20 |$ . 6318|)).#@79 |
|00001930| 4c 61 73 74 20 52 43 53 | 20 72 65 76 69 73 69 6f |Last RCS| revisio|
|00001940| 6e 20 75 73 65 64 20 66 | 6f 72 20 61 6e 63 65 73 |n used f|or ances|
|00001950| 74 6f 72 20 66 69 6c 65 | 20 6f 66 20 61 6e 20 60 |tor file| of an `|
|00001960| 65 6d 65 72 67 65 2d 72 | 65 76 69 73 69 6f 6e 73 |emerge-r|evisions|
|00001970| 2e 2e 2e 27 20 63 6f 6d | 6d 61 6e 64 2e 1f 0a 28 |...' com|mand...(|
|00001980| 64 65 66 76 61 72 20 65 | 6d 65 72 67 65 2d 6c 61 |defvar e|merge-la|
|00001990| 73 74 2d 72 65 76 69 73 | 69 6f 6e 2d 61 6e 63 65 |st-revis|ion-ance|
|000019a0| 73 74 6f 72 20 6e 69 6c | 20 28 23 24 20 2e 20 36 |stor nil| (#$ . 6|
|000019b0| 34 34 38 29 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |448)).(b|yte-code|
|000019c0| 20 22 c0 09 42 11 c2 09 | 42 11 c3 09 42 11 c4 09 | "..B...|B...B...|
|000019d0| 42 11 c5 09 42 11 c6 09 | 42 11 c7 09 42 11 c8 09 |B...B...|B...B...|
|000019e0| 42 11 c9 09 42 11 ca 09 | 42 11 cb 09 42 11 cc 09 |B...B...|B...B...|
|000019f0| 42 11 cd 09 42 11 ce 09 | 42 11 cf 09 42 11 d0 09 |B...B...|B...B...|
|00001a00| 42 11 d1 09 42 11 d2 09 | 42 11 0e 13 ab 8f d4 d5 |B...B...|B.......|
|00001a10| 21 ab 85 d6 d5 21 ac 85 | d7 d8 d5 5c 22 88 d9 da |!....!..|...\"...|
|00001a20| 21 ac 83 db 16 1a da 09 | 42 11 c0 87 22 20 5b 65 |!.......|B..." [e|
|00001a30| 6d 65 72 67 65 2d 62 65 | 66 6f 72 65 2d 66 6c 61 |merge-be|fore-fla|
|00001a40| 67 2d 6c 65 6e 67 74 68 | 20 63 75 72 72 65 6e 74 |g-length| current|
|00001a50| 2d 6c 6f 61 64 2d 6c 69 | 73 74 20 65 6d 65 72 67 |-load-li|st emerg|
|00001a60| 65 2d 62 65 66 6f 72 65 | 2d 66 6c 61 67 2d 6c 69 |e-before|-flag-li|
|00001a70| 6e 65 73 20 65 6d 65 72 | 67 65 2d 62 65 66 6f 72 |nes emer|ge-befor|
|00001a80| 65 2d 66 6c 61 67 2d 6d | 61 74 63 68 20 65 6d 65 |e-flag-m|atch eme|
|00001a90| 72 67 65 2d 61 66 74 65 | 72 2d 66 6c 61 67 2d 6c |rge-afte|r-flag-l|
|00001aa0| 65 6e 67 74 68 20 65 6d | 65 72 67 65 2d 61 66 74 |ength em|erge-aft|
|00001ab0| 65 72 2d 66 6c 61 67 2d | 6c 69 6e 65 73 20 65 6d |er-flag-|lines em|
|00001ac0| 65 72 67 65 2d 61 66 74 | 65 72 2d 66 6c 61 67 2d |erge-aft|er-flag-|
|00001ad0| 6d 61 74 63 68 20 65 6d | 65 72 67 65 2d 70 72 65 |match em|erge-pre|
|00001ae0| 66 69 78 2d 61 72 67 75 | 6d 65 6e 74 20 65 6d 65 |fix-argu|ment eme|
|00001af0| 72 67 65 2d 65 78 69 74 | 2d 66 75 6e 63 20 65 6d |rge-exit|-func em|
|00001b00| 65 72 67 65 2d 67 6c 6f | 62 61 6c 69 7a 65 64 2d |erge-glo|balized-|
|00001b10| 64 69 66 66 65 72 65 6e | 63 65 2d 6c 69 73 74 20 |differen|ce-list |
|00001b20| 65 6d 65 72 67 65 2d 67 | 6c 6f 62 61 6c 69 7a 65 |emerge-g|lobalize|
|00001b30| 64 2d 6e 75 6d 62 65 72 | 2d 6f 66 2d 64 69 66 66 |d-number|-of-diff|
|00001b40| 65 72 65 6e 63 65 73 20 | 41 2d 62 65 67 69 6e 20 |erences |A-begin |
|00001b50| 41 2d 65 6e 64 20 42 2d | 62 65 67 69 6e 20 42 2d |A-end B-|begin B-|
|00001b60| 65 6e 64 20 6d 65 72 67 | 65 2d 62 65 67 69 6e 20 |end merg|e-begin |
|00001b70| 6d 65 72 67 65 2d 65 6e | 64 20 64 69 66 66 2d 76 |merge-en|d diff-v|
|00001b80| 65 63 74 6f 72 20 76 61 | 6c 69 64 2d 64 69 66 66 |ector va|lid-diff|
|00001b90| 20 65 6d 65 72 67 65 2d | 78 65 6d 61 63 73 2d 70 | emerge-|xemacs-p|
|00001ba0| 20 66 69 6e 64 2d 66 61 | 63 65 20 65 6d 65 72 67 | find-fa|ce emerg|
|00001bb0| 65 2d 68 69 67 68 6c 69 | 67 68 74 2d 66 61 63 65 |e-highli|ght-face|
|00001bc0| 20 66 61 63 65 2d 64 69 | 66 66 65 72 73 2d 66 72 | face-di|ffers-fr|
|00001bd0| 6f 6d 2d 64 65 66 61 75 | 6c 74 2d 70 20 63 6f 70 |om-defau|lt-p cop|
|00001be0| 79 2d 66 61 63 65 20 62 | 6f 6c 64 2d 69 74 61 6c |y-face b|old-ital|
|00001bf0| 69 63 20 62 6f 75 6e 64 | 70 20 65 6d 65 72 67 65 |ic bound|p emerge|
|00001c00| 2d 6d 61 72 6b 2d 77 69 | 74 68 2d 74 65 78 74 20 |-mark-wi|th-text |
|00001c10| 74 5d 20 33 29 0a 23 40 | 31 35 32 20 46 75 6e 63 |t] 3).#@|152 Func|
|00001c20| 74 69 6f 6e 20 74 6f 20 | 62 65 20 63 61 6c 6c 65 |tion to |be calle|
|00001c30| 64 20 61 66 74 65 72 20 | 60 65 6d 65 72 67 65 2d |d after |`emerge-|
|00001c40| 7b 62 65 66 6f 72 65 2c | 61 66 74 65 72 7d 2d 66 |{before,|after}-f|
|00001c50| 6c 61 67 27 2e 0a 54 68 | 69 73 20 69 73 20 63 61 |lag'..Th|is is ca|
|00001c60| 6c 6c 65 64 20 61 66 74 | 65 72 20 74 68 65 73 65 |lled aft|er these|
|00001c70| 20 66 75 6e 63 74 69 6f | 6e 73 20 61 72 65 20 63 | functio|ns are c|
|00001c80| 68 61 6e 67 65 64 20 74 | 6f 20 63 6f 6d 70 75 74 |hanged t|o comput|
|00001c90| 65 20 76 61 6c 75 65 73 | 20 74 68 61 74 0a 64 65 |e values| that.de|
|00001ca0| 70 65 6e 64 20 6f 6e 20 | 74 68 65 20 66 6c 61 67 |pend on |the flag|
|00001cb0| 73 2e 1f 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |s...(def|alias 'e|
|00001cc0| 6d 65 72 67 65 2d 6e 65 | 77 2d 66 6c 61 67 73 20 |merge-ne|w-flags |
|00001cd0| 23 5b 6e 69 6c 20 22 08 | 47 11 c2 08 c3 5c 22 14 |#[nil ".|G....\".|
|00001ce0| c5 08 21 16 06 0e 07 47 | 16 08 c2 0e 07 c3 5c 22 |..!....G|......\"|
|00001cf0| 16 09 c5 0e 07 21 89 16 | 5c 6e 87 22 20 5b 65 6d |.....!..|\n." [em|
|00001d00| 65 72 67 65 2d 62 65 66 | 6f 72 65 2d 66 6c 61 67 |erge-bef|ore-flag|
|00001d10| 20 65 6d 65 72 67 65 2d | 62 65 66 6f 72 65 2d 66 | emerge-|before-f|
|00001d20| 6c 61 67 2d 6c 65 6e 67 | 74 68 20 65 6d 65 72 67 |lag-leng|th emerg|
|00001d30| 65 2d 63 6f 75 6e 74 2d | 6d 61 74 63 68 65 73 2d |e-count-|matches-|
|00001d40| 73 74 72 69 6e 67 20 22 | 5c 6e 22 20 65 6d 65 72 |string "|\n" emer|
|00001d50| 67 65 2d 62 65 66 6f 72 | 65 2d 66 6c 61 67 2d 6c |ge-befor|e-flag-l|
|00001d60| 69 6e 65 73 20 72 65 67 | 65 78 70 2d 71 75 6f 74 |ines reg|exp-quot|
|00001d70| 65 20 65 6d 65 72 67 65 | 2d 62 65 66 6f 72 65 2d |e emerge|-before-|
|00001d80| 66 6c 61 67 2d 6d 61 74 | 63 68 20 65 6d 65 72 67 |flag-mat|ch emerg|
|00001d90| 65 2d 61 66 74 65 72 2d | 66 6c 61 67 20 65 6d 65 |e-after-|flag eme|
|00001da0| 72 67 65 2d 61 66 74 65 | 72 2d 66 6c 61 67 2d 6c |rge-afte|r-flag-l|
|00001db0| 65 6e 67 74 68 20 65 6d | 65 72 67 65 2d 61 66 74 |ength em|erge-aft|
|00001dc0| 65 72 2d 66 6c 61 67 2d | 6c 69 6e 65 73 20 65 6d |er-flag-|lines em|
|00001dd0| 65 72 67 65 2d 61 66 74 | 65 72 2d 66 6c 61 67 2d |erge-aft|er-flag-|
|00001de0| 6d 61 74 63 68 5d 20 33 | 20 28 23 24 20 2e 20 37 |match] 3| (#$ . 7|
|00001df0| 31 39 36 29 5d 29 0a 23 | 40 35 32 20 52 65 74 75 |196)]).#|@52 Retu|
|00001e00| 72 6e 20 74 68 65 20 6e | 75 6d 62 65 72 20 6f 66 |rn the n|umber of|
|00001e10| 20 6d 61 74 63 68 65 73 | 20 69 6e 20 53 54 52 49 | matches| in STRI|
|00001e20| 4e 47 20 66 6f 72 20 52 | 45 47 45 58 50 2e 1f 0a |NG for R|EGEXP...|
|00001e30| 28 64 65 66 61 6c 69 61 | 73 20 27 65 6d 65 72 67 |(defalia|s 'emerg|
|00001e40| 65 2d 63 6f 75 6e 74 2d | 6d 61 74 63 68 65 73 2d |e-count-|matches-|
|00001e50| 73 74 72 69 6e 67 20 23 | 5b 28 73 74 72 69 6e 67 |string #|[(string|
|00001e60| 20 72 65 67 65 78 70 29 | 20 22 c0 89 19 1a c3 0c | regexp)| "......|
|00001e70| 0d 5c 6e 23 ab 88 09 54 | 11 c0 95 12 aa 71 09 2a |.\n#...T|.....q.*|
|00001e80| 87 22 20 5b 30 20 63 6f | 75 6e 74 20 69 20 73 74 |." [0 co|unt i st|
|00001e90| 72 69 6e 67 2d 6d 61 74 | 63 68 20 72 65 67 65 78 |ring-mat|ch regex|
|00001ea0| 70 20 73 74 72 69 6e 67 | 5d 20 34 20 28 23 24 20 |p string|] 4 (#$ |
|00001eb0| 2e 20 37 36 37 36 29 5d | 29 0a 28 65 6d 65 72 67 |. 7676)]|).(emerg|
|00001ec0| 65 2d 6e 65 77 2d 66 6c | 61 67 73 29 0a 23 40 31 |e-new-fl|ags).#@1|
|00001ed0| 30 32 20 2a 4e 75 6d 62 | 65 72 20 6f 66 20 6c 69 |02 *Numb|er of li|
|00001ee0| 6e 65 73 20 74 68 61 74 | 20 77 65 20 77 61 6e 74 |nes that| we want|
|00001ef0| 20 74 6f 20 73 68 6f 77 | 20 61 62 6f 76 65 20 61 | to show| above a|
|00001f00| 6e 64 20 62 65 6c 6f 77 | 20 74 68 65 20 66 6c 61 |nd below| the fla|
|00001f10| 67 73 20 77 68 65 6e 20 | 77 65 20 61 72 65 0a 64 |gs when |we are.d|
|00001f20| 69 73 70 6c 61 79 69 6e | 67 20 61 20 64 69 66 66 |isplayin|g a diff|
|00001f30| 65 72 65 6e 63 65 2e 1f | 0a 28 64 65 66 76 61 72 |erence..|.(defvar|
|00001f40| 20 65 6d 65 72 67 65 2d | 6d 69 6e 2d 76 69 73 69 | emerge-|min-visi|
|00001f50| 62 6c 65 2d 6c 69 6e 65 | 73 20 33 20 28 23 24 20 |ble-line|s 3 (#$ |
|00001f60| 2e 20 2d 37 38 39 31 29 | 29 0a 23 40 38 39 20 2a |. -7891)|).#@89 *|
|00001f70| 50 72 65 66 69 78 20 74 | 6f 20 70 75 74 20 6f 6e |Prefix t|o put on|
|00001f80| 20 45 6d 65 72 67 65 20 | 74 65 6d 70 6f 72 61 72 | Emerge |temporar|
|00001f90| 79 20 66 69 6c 65 20 6e | 61 6d 65 73 2e 0a 44 6f |y file n|ames..Do|
|00001fa0| 20 6e 6f 74 20 73 74 61 | 72 74 20 77 69 74 68 20 | not sta|rt with |
|00001fb0| 60 7e 2f 27 20 6f 72 20 | 60 7e 75 73 65 72 2d 6e |`~/' or |`~user-n|
|00001fc0| 61 6d 65 2f 27 2e 1f 0a | 28 64 65 66 76 61 72 20 |ame/'...|(defvar |
|00001fd0| 65 6d 65 72 67 65 2d 74 | 65 6d 70 2d 66 69 6c 65 |emerge-t|emp-file|
|00001fe0| 2d 70 72 65 66 69 78 20 | 28 62 79 74 65 2d 63 6f |-prefix |(byte-co|
|00001ff0| 64 65 20 22 c0 c1 21 ae | 88 c0 c2 21 ae 83 c0 c3 |de "..!.|...!....|
|00002000| 21 c4 1d 89 1e 06 ab 8b | 0e 06 47 c7 56 ab 84 0e |!.......|..G.V...|
|00002010| 06 aa 81 c8 89 15 89 47 | 53 48 c9 55 ab 85 0d c7 |.......G|SH.U....|
|00002020| ca 4f 15 0d cb 50 2a 87 | 22 20 5b 67 65 74 65 6e |.O...P*.|" [geten|
|00002030| 76 20 22 54 4d 50 44 49 | 52 22 20 22 54 4d 50 22 |v "TMPDI|R" "TMP"|
|00002040| 20 22 54 45 4d 50 22 20 | 6e 69 6c 20 64 20 65 6e | "TEMP" |nil d en|
|00002050| 76 20 30 20 22 2f 74 6d | 70 22 20 3f 5c 2f 20 2d |v 0 "/tm|p" ?\/ -|
|00002060| 31 20 22 2f 65 6d 65 72 | 67 65 22 5d 20 34 29 20 |1 "/emer|ge"] 4) |
|00002070| 28 23 24 20 2e 20 2d 38 | 30 34 37 29 29 0a 23 40 |(#$ . -8|047)).#@|
|00002080| 33 35 20 2a 4d 6f 64 65 | 20 66 6f 72 20 45 6d 65 |35 *Mode| for Eme|
|00002090| 72 67 65 20 74 65 6d 70 | 6f 72 61 72 79 20 66 69 |rge temp|orary fi|
|000020a0| 6c 65 73 2e 1f 0a 28 64 | 65 66 76 61 72 20 65 6d |les...(d|efvar em|
|000020b0| 65 72 67 65 2d 74 65 6d | 70 2d 66 69 6c 65 2d 6d |erge-tem|p-file-m|
|000020c0| 6f 64 65 20 33 38 34 20 | 28 23 24 20 2e 20 2d 38 |ode 384 |(#$ . -8|
|000020d0| 33 32 33 29 29 0a 23 40 | 34 32 38 20 2a 54 65 6d |323)).#@|428 *Tem|
|000020e0| 70 6c 61 74 65 20 66 6f | 72 20 60 65 6d 65 72 67 |plate fo|r `emerg|
|000020f0| 65 2d 63 6f 6d 62 69 6e | 65 2d 76 65 72 73 69 6f |e-combin|e-versio|
|00002100| 6e 73 27 20 74 6f 20 63 | 6f 6d 62 69 6e 65 20 74 |ns' to c|ombine t|
|00002110| 68 65 20 74 77 6f 20 76 | 65 72 73 69 6f 6e 73 2e |he two v|ersions.|
|00002120| 0a 54 68 65 20 74 65 6d | 70 6c 61 74 65 20 69 73 |.The tem|plate is|
|00002130| 20 69 6e 73 65 72 74 65 | 64 20 61 73 20 61 20 73 | inserte|d as a s|
|00002140| 74 72 69 6e 67 2c 20 77 | 69 74 68 20 74 68 65 20 |tring, w|ith the |
|00002150| 66 6f 6c 6c 6f 77 69 6e | 67 20 69 6e 74 65 72 70 |followin|g interp|
|00002160| 6f 6c 61 74 69 6f 6e 73 | 3a 0a 09 25 61 09 74 68 |olations|:..%a.th|
|00002170| 65 20 41 20 76 65 72 73 | 69 6f 6e 20 6f 66 20 74 |e A vers|ion of t|
|00002180| 68 65 20 64 69 66 66 65 | 72 65 6e 63 65 0a 09 25 |he diffe|rence..%|
|00002190| 62 09 74 68 65 20 42 20 | 76 65 72 73 69 6f 6e 20 |b.the B |version |
|000021a0| 6f 66 20 74 68 65 20 64 | 69 66 66 65 72 65 6e 63 |of the d|ifferenc|
|000021b0| 65 0a 09 25 25 09 74 68 | 65 20 63 68 61 72 61 63 |e..%%.th|e charac|
|000021c0| 74 65 72 20 60 25 27 0a | 44 6f 6e 27 74 20 66 6f |ter `%'.|Don't fo|
|000021d0| 72 67 65 74 20 74 6f 20 | 65 6e 64 20 74 68 65 20 |rget to |end the |
|000021e0| 74 65 6d 70 6c 61 74 65 | 20 77 69 74 68 20 61 20 |template| with a |
|000021f0| 6e 65 77 6c 69 6e 65 2e | 0a 4e 6f 74 65 20 74 68 |newline.|.Note th|
|00002200| 61 74 20 74 68 69 73 20 | 76 61 72 69 61 62 6c 65 |at this |variable|
|00002210| 20 63 61 6e 20 62 65 20 | 6d 61 64 65 20 6c 6f 63 | can be |made loc|
|00002220| 61 6c 20 74 6f 20 61 20 | 70 61 72 74 69 63 75 6c |al to a |particul|
|00002230| 61 72 20 6d 65 72 67 65 | 20 62 75 66 66 65 72 20 |ar merge| buffer |
|00002240| 62 79 0a 67 69 76 69 6e | 67 20 61 20 70 72 65 66 |by.givin|g a pref|
|00002250| 69 78 20 61 72 67 75 6d | 65 6e 74 20 74 6f 20 60 |ix argum|ent to `|
|00002260| 65 6d 65 72 67 65 2d 73 | 65 74 2d 63 6f 6d 62 69 |emerge-s|et-combi|
|00002270| 6e 65 2d 76 65 72 73 69 | 6f 6e 73 2d 74 65 6d 70 |ne-versi|ons-temp|
|00002280| 6c 61 74 65 27 2e 1f 0a | 28 64 65 66 76 61 72 20 |late'...|(defvar |
|00002290| 65 6d 65 72 67 65 2d 63 | 6f 6d 62 69 6e 65 2d 76 |emerge-c|ombine-v|
|000022a0| 65 72 73 69 6f 6e 73 2d | 74 65 6d 70 6c 61 74 65 |ersions-|template|
|000022b0| 20 22 23 69 66 64 65 66 | 20 4e 45 57 5c 6e 25 62 | "#ifdef| NEW\n%b|
|000022c0| 23 65 6c 73 65 20 2f 2a | 20 4e 45 57 20 2a 2f 5c |#else /*| NEW */\|
|000022d0| 6e 25 61 23 65 6e 64 69 | 66 20 2f 2a 20 4e 45 57 |n%a#endi|f /* NEW|
|000022e0| 20 2a 2f 5c 6e 22 20 28 | 23 24 20 2e 20 2d 38 34 | */\n" (|#$ . -84|
|000022f0| 31 32 29 29 0a 23 40 31 | 34 33 20 4b 65 79 6d 61 |12)).#@1|43 Keyma|
|00002300| 70 20 6f 66 20 45 6d 65 | 72 67 65 20 63 6f 6d 6d |p of Eme|rge comm|
|00002310| 61 6e 64 73 2e 0a 44 69 | 72 65 63 74 6c 79 20 61 |ands..Di|rectly a|
|00002320| 76 61 69 6c 61 62 6c 65 | 20 69 6e 20 60 66 61 73 |vailable| in `fas|
|00002330| 74 27 20 6d 6f 64 65 3b | 0a 6d 75 73 74 20 62 65 |t' mode;|.must be|
|00002340| 20 70 72 65 66 69 78 65 | 64 20 62 79 20 5c 3c 65 | prefixe|d by \<e|
|00002350| 6d 65 72 67 65 2d 66 61 | 73 74 2d 6b 65 79 6d 61 |merge-fa|st-keyma|
|00002360| 70 3e 5c 5b 65 6d 65 72 | 67 65 2d 62 61 73 69 63 |p>\[emer|ge-basic|
|00002370| 2d 6b 65 79 6d 61 70 5d | 20 69 6e 20 60 65 64 69 |-keymap]| in `edi|
|00002380| 74 27 20 6d 6f 64 65 2e | 1f 0a 28 64 65 66 76 61 |t' mode.|..(defva|
|00002390| 72 20 65 6d 65 72 67 65 | 2d 62 61 73 69 63 2d 6b |r emerge|-basic-k|
|000023a0| 65 79 6d 61 70 20 6e 69 | 6c 20 28 23 24 20 2e 20 |eymap ni|l (#$ . |
|000023b0| 38 39 35 35 29 29 0a 23 | 40 38 34 20 4c 6f 63 61 |8955)).#|@84 Loca|
|000023c0| 6c 20 6b 65 79 6d 61 70 | 20 75 73 65 64 20 69 6e |l keymap| used in|
|000023d0| 20 45 6d 65 72 67 65 20 | 60 66 61 73 74 27 20 6d | Emerge |`fast' m|
|000023e0| 6f 64 65 2e 0a 4d 61 6b | 65 73 20 45 6d 65 72 67 |ode..Mak|es Emerg|
|000023f0| 65 20 63 6f 6d 6d 61 6e | 64 73 20 64 69 72 65 63 |e comman|ds direc|
|00002400| 74 6c 79 20 61 76 61 69 | 6c 61 62 6c 65 2e 1f 0a |tly avai|lable...|
|00002410| 28 64 65 66 76 61 72 20 | 65 6d 65 72 67 65 2d 66 |(defvar |emerge-f|
|00002420| 61 73 74 2d 6b 65 79 6d | 61 70 20 6e 69 6c 20 28 |ast-keym|ap nil (|
|00002430| 23 24 20 2e 20 39 31 34 | 38 29 29 0a 23 40 39 30 |#$ . 914|8)).#@90|
|00002440| 20 2a 43 6f 6d 6d 61 6e | 64 20 70 72 65 66 69 78 | *Comman|d prefix|
|00002450| 20 66 6f 72 20 45 6d 65 | 72 67 65 20 63 6f 6d 6d | for Eme|rge comm|
|00002460| 61 6e 64 73 20 69 6e 20 | 27 65 64 69 74 27 20 6d |ands in |'edit' m|
|00002470| 6f 64 65 2e 0a 4d 75 73 | 74 20 62 65 20 73 65 74 |ode..Mus|t be set|
|00002480| 20 62 65 66 6f 72 65 20 | 45 6d 65 72 67 65 20 69 | before |Emerge i|
|00002490| 73 20 6c 6f 61 64 65 64 | 2e 1f 0a 28 64 65 66 76 |s loaded|...(defv|
|000024a0| 61 72 20 65 6d 65 72 67 | 65 2d 63 6f 6d 6d 61 6e |ar emerg|e-comman|
|000024b0| 64 2d 70 72 65 66 69 78 | 20 22 03 22 20 28 23 24 |d-prefix| "." (#$|
|000024c0| 20 2e 20 2d 39 32 38 31 | 29 29 0a 28 64 65 66 61 | . -9281|)).(defa|
|000024d0| 6c 69 61 73 20 27 65 6d | 65 72 67 65 2d 73 65 74 |lias 'em|erge-set|
|000024e0| 75 70 2d 66 69 78 65 64 | 2d 6b 65 79 6d 61 70 73 |up-fixed|-keymaps|
|000024f0| 20 23 5b 6e 69 6c 20 22 | c0 20 11 c2 09 c1 5c 22 | #[nil "|. ....\"|
|00002500| 88 c3 09 21 88 c4 09 c5 | c6 23 88 c4 09 c7 c8 23 |...!....|.#.....#|
|00002510| 88 c4 09 c9 ca 23 88 c4 | 09 cb cc 23 88 c4 09 cd |.....#..|...#....|
|00002520| ce 23 88 c4 09 cf d0 23 | 88 c4 09 d1 d2 23 88 c4 |.#.....#|.....#..|
|00002530| 09 d3 d4 23 88 c4 09 d5 | d6 23 88 c4 09 d7 d8 23 |...#....|.#.....#|
|00002540| 88 c4 09 d9 da 23 88 c4 | 09 db dc 23 88 c4 09 dd |.....#..|...#....|
|00002550| de 23 88 c4 09 df e0 23 | 88 c4 09 e1 da 23 88 c4 |.#.....#|.....#..|
|00002560| 09 e2 e3 23 88 c4 09 e4 | e5 23 88 c4 09 e6 da 23 |...#....|.#.....#|
|00002570| 88 c4 09 e7 e8 23 88 c4 | 09 e9 ea 23 88 c4 09 eb |.....#..|...#....|
|00002580| da 23 88 c4 09 ec ed 23 | 88 c4 09 ee ef 23 88 c4 |.#.....#|.....#..|
|00002590| 09 f0 f1 23 88 c4 09 f2 | f3 23 88 c4 09 f4 f5 23 |...#....|.#.....#|
|000025a0| 88 c4 09 f6 f7 23 88 c4 | 09 f8 f9 23 88 c4 09 fa |.....#..|...#....|
|000025b0| fb 23 88 c4 09 fc da 23 | 88 c4 09 fd fe 23 88 c4 |.#.....#|.....#..|
|000025c0| 09 ff 81 40 00 23 88 c4 | 09 81 41 00 81 42 00 23 |...@.#..|..A..B.#|
|000025d0| 88 c4 09 81 43 00 81 44 | 00 23 88 c4 09 81 45 00 |....C..D|.#....E.|
|000025e0| 81 46 00 23 88 c4 09 81 | 47 00 d0 23 88 c4 09 81 |.F.#....|G..#....|
|000025f0| 48 00 81 49 00 23 88 c4 | 09 81 4a 00 81 4b 00 23 |H..I.#..|..J..K.#|
|00002600| 88 c4 09 81 4c 00 81 4d | 00 23 88 c4 09 81 4e 00 |....L..M|.#....N.|
|00002610| 81 4f 00 23 88 c4 09 81 | 50 00 81 51 00 23 88 c4 |.O.#....|P..Q.#..|
|00002620| 09 81 52 00 81 53 00 23 | 88 c4 09 81 54 00 81 55 |..R..S.#|....T..U|
|00002630| 00 23 88 c1 09 4d 88 81 | 56 00 20 16 57 81 58 00 |.#...M..|V. .W.X.|
|00002640| 0e 57 09 5c 22 88 c2 0e | 57 81 57 00 5c 22 88 c4 |.W.\"...|W.W.\"..|
|00002650| 0e 57 0e 59 c1 23 88 81 | 57 00 0e 57 4d 88 81 5a |.W.Y.#..|W..WM..Z|
|00002660| 00 81 5b 00 81 5c 5c 00 | 0e 57 81 5d 00 20 24 88 |..[..\\.|.W.]. $.|
|00002670| 81 5a 00 81 5e 00 81 5f | 00 0e 57 81 5d 00 20 24 |.Z..^.._|..W.]. $|
|00002680| 87 22 20 5b 6d 61 6b 65 | 2d 6b 65 79 6d 61 70 20 |." [make|-keymap |
|00002690| 65 6d 65 72 67 65 2d 62 | 61 73 69 63 2d 6b 65 79 |emerge-b|asic-key|
|000026a0| 6d 61 70 20 73 65 74 2d | 6b 65 79 6d 61 70 2d 6e |map set-|keymap-n|
|000026b0| 61 6d 65 20 73 75 70 70 | 72 65 73 73 2d 6b 65 79 |ame supp|ress-key|
|000026c0| 6d 61 70 20 64 65 66 69 | 6e 65 2d 6b 65 79 20 22 |map defi|ne-key "|
|000026d0| 70 22 20 65 6d 65 72 67 | 65 2d 70 72 65 76 69 6f |p" emerg|e-previo|
|000026e0| 75 73 2d 64 69 66 66 65 | 72 65 6e 63 65 20 22 6e |us-diffe|rence "n|
|000026f0| 22 20 65 6d 65 72 67 65 | 2d 6e 65 78 74 2d 64 69 |" emerge|-next-di|
|00002700| 66 66 65 72 65 6e 63 65 | 20 22 61 22 20 65 6d 65 |fference| "a" eme|
|00002710| 72 67 65 2d 73 65 6c 65 | 63 74 2d 41 20 22 62 22 |rge-sele|ct-A "b"|
|00002720| 20 65 6d 65 72 67 65 2d | 73 65 6c 65 63 74 2d 42 | emerge-|select-B|
|00002730| 20 22 6a 22 20 65 6d 65 | 72 67 65 2d 6a 75 6d 70 | "j" eme|rge-jump|
|00002740| 2d 74 6f 2d 64 69 66 66 | 65 72 65 6e 63 65 20 22 |-to-diff|erence "|
|00002750| 2e 22 20 65 6d 65 72 67 | 65 2d 66 69 6e 64 2d 64 |." emerg|e-find-d|
|00002760| 69 66 66 65 72 65 6e 63 | 65 20 22 71 22 20 65 6d |ifferenc|e "q" em|
|00002770| 65 72 67 65 2d 71 75 69 | 74 20 22 1d 22 20 65 6d |erge-qui|t "." em|
|00002780| 65 72 67 65 2d 61 62 6f | 72 74 20 22 66 22 20 65 |erge-abo|rt "f" e|
|00002790| 6d 65 72 67 65 2d 66 61 | 73 74 2d 6d 6f 64 65 20 |merge-fa|st-mode |
|000027a0| 22 65 22 20 65 6d 65 72 | 67 65 2d 65 64 69 74 2d |"e" emer|ge-edit-|
|000027b0| 6d 6f 64 65 20 22 73 22 | 20 6e 69 6c 20 22 73 61 |mode "s"| nil "sa|
|000027c0| 22 20 65 6d 65 72 67 65 | 2d 61 75 74 6f 2d 61 64 |" emerge|-auto-ad|
|000027d0| 76 61 6e 63 65 20 22 73 | 73 22 20 65 6d 65 72 67 |vance "s|s" emerg|
|000027e0| 65 2d 73 6b 69 70 2d 70 | 72 65 66 65 72 73 20 22 |e-skip-p|refers "|
|000027f0| 6c 22 20 65 6d 65 72 67 | 65 2d 72 65 63 65 6e 74 |l" emerg|e-recent|
|00002800| 65 72 20 22 64 22 20 22 | 64 61 22 20 65 6d 65 72 |er "d" "|da" emer|
|00002810| 67 65 2d 64 65 66 61 75 | 6c 74 2d 41 20 22 64 62 |ge-defau|lt-A "db|
|00002820| 22 20 65 6d 65 72 67 65 | 2d 64 65 66 61 75 6c 74 |" emerge|-default|
|00002830| 2d 42 20 22 63 22 20 22 | 63 61 22 20 65 6d 65 72 |-B "c" "|ca" emer|
|00002840| 67 65 2d 63 6f 70 79 2d | 61 73 2d 6b 69 6c 6c 2d |ge-copy-|as-kill-|
|00002850| 41 20 22 63 62 22 20 65 | 6d 65 72 67 65 2d 63 6f |A "cb" e|merge-co|
|00002860| 70 79 2d 61 73 2d 6b 69 | 6c 6c 2d 42 20 22 69 22 |py-as-ki|ll-B "i"|
|00002870| 20 22 69 61 22 20 65 6d | 65 72 67 65 2d 69 6e 73 | "ia" em|erge-ins|
|00002880| 65 72 74 2d 41 20 22 69 | 62 22 20 65 6d 65 72 67 |ert-A "i|b" emerg|
|00002890| 65 2d 69 6e 73 65 72 74 | 2d 42 20 22 6d 22 20 65 |e-insert|-B "m" e|
|000028a0| 6d 65 72 67 65 2d 6d 61 | 72 6b 2d 64 69 66 66 65 |merge-ma|rk-diffe|
|000028b0| 72 65 6e 63 65 20 22 76 | 22 20 65 6d 65 72 67 65 |rence "v|" emerge|
|000028c0| 2d 73 63 72 6f 6c 6c 2d | 75 70 20 22 5e 22 20 65 |-scroll-|up "^" e|
|000028d0| 6d 65 72 67 65 2d 73 63 | 72 6f 6c 6c 2d 64 6f 77 |merge-sc|roll-dow|
|000028e0| 6e 20 22 3c 22 20 65 6d | 65 72 67 65 2d 73 63 72 |n "<" em|erge-scr|
|000028f0| 6f 6c 6c 2d 6c 65 66 74 | 20 22 3e 22 20 65 6d 65 |oll-left| ">" eme|
|00002900| 72 67 65 2d 73 63 72 6f | 6c 6c 2d 72 69 67 68 74 |rge-scro|ll-right|
|00002910| 20 22 7c 22 20 65 6d 65 | 72 67 65 2d 73 63 72 6f | "|" eme|rge-scro|
|00002920| 6c 6c 2d 72 65 73 65 74 | 20 22 78 22 20 22 78 31 |ll-reset| "x" "x1|
|00002930| 22 20 65 6d 65 72 67 65 | 2d 6f 6e 65 2d 6c 69 6e |" emerge|-one-lin|
|00002940| 65 2d 77 69 6e 64 6f 77 | 20 22 78 61 22 20 65 6d |e-window| "xa" em|
|00002950| 65 72 67 65 2d 66 69 6e | 64 2d 64 69 66 66 65 72 |erge-fin|d-differ|
|00002960| 65 6e 63 65 2d 41 20 22 | 78 62 22 20 65 6d 65 72 |ence-A "|xb" emer|
|00002970| 67 65 2d 66 69 6e 64 2d | 64 69 66 66 65 72 65 6e |ge-find-|differen|
|00002980| 63 65 2d 42 20 22 78 63 | 22 20 65 6d 65 72 67 65 |ce-B "xc|" emerge|
|00002990| 2d 63 6f 6d 62 69 6e 65 | 2d 76 65 72 73 69 6f 6e |-combine|-version|
|000029a0| 73 20 22 78 43 22 20 65 | 6d 65 72 67 65 2d 63 6f |s "xC" e|merge-co|
|000029b0| 6d 62 69 6e 65 2d 76 65 | 72 73 69 6f 6e 73 2d 72 |mbine-ve|rsions-r|
|000029c0| 65 67 69 73 74 65 72 20 | 22 78 64 22 20 22 78 66 |egister |"xd" "xf|
|000029d0| 22 20 65 6d 65 72 67 65 | 2d 66 69 6c 65 2d 6e 61 |" emerge|-file-na|
|000029e0| 6d 65 73 20 22 78 6a 22 | 20 65 6d 65 72 67 65 2d |mes "xj"| emerge-|
|000029f0| 6a 6f 69 6e 2d 64 69 66 | 66 65 72 65 6e 63 65 73 |join-dif|ferences|
|00002a00| 20 22 78 6c 22 20 65 6d | 65 72 67 65 2d 6c 69 6e | "xl" em|erge-lin|
|00002a10| 65 2d 6e 75 6d 62 65 72 | 73 20 22 78 6d 22 20 65 |e-number|s "xm" e|
|00002a20| 6d 65 72 67 65 2d 73 65 | 74 2d 6d 65 72 67 65 2d |merge-se|t-merge-|
|00002a30| 6d 6f 64 65 20 22 78 73 | 22 20 65 6d 65 72 67 65 |mode "xs|" emerge|
|00002a40| 2d 73 70 6c 69 74 2d 64 | 69 66 66 65 72 65 6e 63 |-split-d|ifferenc|
|00002a50| 65 20 22 78 74 22 20 65 | 6d 65 72 67 65 2d 74 72 |e "xt" e|merge-tr|
|00002a60| 69 6d 2d 64 69 66 66 65 | 72 65 6e 63 65 20 22 78 |im-diffe|rence "x|
|00002a70| 78 22 20 65 6d 65 72 67 | 65 2d 73 65 74 2d 63 6f |x" emerg|e-set-co|
|00002a80| 6d 62 69 6e 65 2d 76 65 | 72 73 69 6f 6e 73 2d 74 |mbine-ve|rsions-t|
|00002a90| 65 6d 70 6c 61 74 65 20 | 6d 61 6b 65 2d 73 70 61 |emplate |make-spa|
|00002aa0| 72 73 65 2d 6b 65 79 6d | 61 70 20 65 6d 65 72 67 |rse-keym|ap emerg|
|00002ab0| 65 2d 66 61 73 74 2d 6b | 65 79 6d 61 70 20 73 65 |e-fast-k|eymap se|
|00002ac0| 74 2d 6b 65 79 6d 61 70 | 2d 70 61 72 65 6e 74 20 |t-keymap|-parent |
|00002ad0| 65 6d 65 72 67 65 2d 63 | 6f 6d 6d 61 6e 64 2d 70 |emerge-c|ommand-p|
|00002ae0| 72 65 66 69 78 20 73 75 | 62 73 74 69 74 75 74 65 |refix su|bstitute|
|00002af0| 2d 6b 65 79 2d 64 65 66 | 69 6e 69 74 69 6f 6e 20 |-key-def|inition |
|00002b00| 77 72 69 74 65 2d 66 69 | 6c 65 20 65 6d 65 72 67 |write-fi|le emerg|
|00002b10| 65 2d 71 75 65 72 79 2d | 77 72 69 74 65 2d 66 69 |e-query-|write-fi|
|00002b20| 6c 65 20 63 75 72 72 65 | 6e 74 2d 67 6c 6f 62 61 |le curre|nt-globa|
|00002b30| 6c 2d 6d 61 70 20 73 61 | 76 65 2d 62 75 66 66 65 |l-map sa|ve-buffe|
|00002b40| 72 20 65 6d 65 72 67 65 | 2d 71 75 65 72 79 2d 73 |r emerge|-query-s|
|00002b50| 61 76 65 2d 62 75 66 66 | 65 72 5d 20 35 5d 29 0a |ave-buff|er] 5]).|
|00002b60| 23 40 33 33 20 4d 65 6e | 75 62 61 72 20 65 6e 74 |#@33 Men|ubar ent|
|00002b70| 72 79 20 66 6f 72 20 75 | 73 69 6e 67 20 45 6d 65 |ry for u|sing Eme|
|00002b80| 72 67 65 2e 1f 0a 28 64 | 65 66 76 61 72 20 65 6d |rge...(d|efvar em|
|00002b90| 65 72 67 65 2d 6d 65 6e | 75 20 27 28 5b 22 42 75 |erge-men|u '(["Bu|
|00002ba0| 66 66 65 72 73 20 2e 2e | 2e 22 20 65 6d 65 72 67 |ffers ..|." emerg|
|00002bb0| 65 2d 62 75 66 66 65 72 | 73 20 74 5d 20 5b 22 42 |e-buffer|s t] ["B|
|00002bc0| 75 66 66 65 72 73 20 57 | 69 74 68 20 41 6e 63 65 |uffers W|ith Ance|
|00002bd0| 73 74 6f 72 20 2e 2e 2e | 22 20 65 6d 65 72 67 65 |stor ...|" emerge|
|00002be0| 2d 62 75 66 66 65 72 73 | 2d 77 69 74 68 2d 61 6e |-buffers|-with-an|
|00002bf0| 63 65 73 74 6f 72 20 74 | 5d 20 5b 22 46 69 6c 65 |cestor t|] ["File|
|00002c00| 73 20 2e 2e 2e 22 20 65 | 6d 65 72 67 65 2d 66 69 |s ..." e|merge-fi|
|00002c10| 6c 65 73 20 74 5d 20 5b | 22 46 69 6c 65 73 20 77 |les t] [|"Files w|
|00002c20| 69 74 68 20 41 6e 63 65 | 73 74 6f 72 20 2e 2e 2e |ith Ance|stor ...|
|00002c30| 22 20 65 6d 65 72 67 65 | 2d 66 69 6c 65 73 2d 77 |" emerge|-files-w|
|00002c40| 69 74 68 2d 61 6e 63 65 | 73 74 6f 72 20 74 5d 20 |ith-ance|stor t] |
|00002c50| 5b 22 52 65 76 69 73 69 | 6f 6e 73 20 2e 2e 2e 22 |["Revisi|ons ..."|
|00002c60| 20 65 6d 65 72 67 65 2d | 72 65 76 69 73 69 6f 6e | emerge-|revision|
|00002c70| 73 20 74 5d 20 5b 22 52 | 65 76 69 73 69 6f 6e 73 |s t] ["R|evisions|
|00002c80| 20 77 69 74 68 20 41 6e | 63 65 73 74 6f 72 20 2e | with An|cestor .|
|00002c90| 2e 2e 22 20 65 6d 65 72 | 67 65 2d 72 65 76 69 73 |.." emer|ge-revis|
|00002ca0| 69 6f 6e 73 2d 77 69 74 | 68 2d 61 6e 63 65 73 74 |ions-wit|h-ancest|
|00002cb0| 6f 72 20 74 5d 20 5b 22 | 4d 65 72 67 65 20 44 69 |or t] ["|Merge Di|
|00002cc0| 72 65 63 74 6f 72 69 65 | 73 20 2e 2e 2e 22 20 65 |rectorie|s ..." e|
|00002cd0| 6d 65 72 67 65 2d 6d 65 | 72 67 65 2d 64 69 72 65 |merge-me|rge-dire|
|00002ce0| 63 74 6f 72 69 65 73 20 | 74 5d 29 20 28 23 24 20 |ctories |t]) (#$ |
|00002cf0| 2e 20 31 31 31 30 39 29 | 29 0a 23 40 34 33 20 4d |. 11109)|).#@43 M|
|00002d00| 65 6e 75 62 61 72 20 65 | 6e 74 72 79 20 77 68 69 |enubar e|ntry whi|
|00002d10| 6c 65 20 69 6e 20 45 6d | 65 72 67 65 20 6d 69 6e |le in Em|erge min|
|00002d20| 6f 72 20 6d 6f 64 65 2e | 1f 0a 28 64 65 66 76 61 |or mode.|..(defva|
|00002d30| 72 20 65 6d 65 72 67 65 | 2d 6d 6f 64 65 2d 6d 65 |r emerge|-mode-me|
|00002d40| 6e 75 20 27 28 5b 22 4e | 65 78 74 20 44 69 66 66 |nu '(["N|ext Diff|
|00002d50| 65 72 65 6e 63 65 22 20 | 65 6d 65 72 67 65 2d 6e |erence" |emerge-n|
|00002d60| 65 78 74 2d 64 69 66 66 | 65 72 65 6e 63 65 20 74 |ext-diff|erence t|
|00002d70| 5d 20 5b 22 50 72 65 76 | 69 6f 75 73 20 44 69 66 |] ["Prev|ious Dif|
|00002d80| 66 65 72 65 6e 63 65 22 | 20 65 6d 65 72 67 65 2d |ference"| emerge-|
|00002d90| 70 72 65 76 69 6f 75 73 | 2d 64 69 66 66 65 72 65 |previous|-differe|
|00002da0| 6e 63 65 20 74 5d 20 28 | 22 4f 74 68 65 72 20 4d |nce t] (|"Other M|
|00002db0| 6f 74 69 6f 6e 22 20 5b | 22 46 69 6e 64 20 44 69 |otion" [|"Find Di|
|00002dc0| 66 66 65 72 65 6e 63 65 | 22 20 65 6d 65 72 67 65 |fference|" emerge|
|00002dd0| 2d 66 69 6e 64 2d 64 69 | 66 66 65 72 65 6e 63 65 |-find-di|fference|
|00002de0| 20 74 5d 20 5b 22 4a 75 | 6d 70 20 54 6f 20 44 69 | t] ["Ju|mp To Di|
|00002df0| 66 66 65 72 65 6e 63 65 | 22 20 65 6d 65 72 67 65 |fference|" emerge|
|00002e00| 2d 6a 75 6d 70 2d 74 6f | 2d 64 69 66 66 65 72 65 |-jump-to|-differe|
|00002e10| 6e 63 65 20 74 5d 20 5b | 22 4d 61 72 6b 20 44 69 |nce t] [|"Mark Di|
|00002e20| 66 66 65 72 65 6e 63 65 | 22 20 65 6d 65 72 67 65 |fference|" emerge|
|00002e30| 2d 6d 61 72 6b 2d 64 69 | 66 66 65 72 65 6e 63 65 |-mark-di|fference|
|00002e40| 20 74 5d 20 5b 22 52 65 | 63 65 6e 74 65 72 22 20 | t] ["Re|center" |
|00002e50| 65 6d 65 72 67 65 2d 72 | 65 63 65 6e 74 65 72 20 |emerge-r|ecenter |
|00002e60| 74 5d 20 5b 22 53 63 72 | 6f 6c 6c 20 55 70 22 20 |t] ["Scr|oll Up" |
|00002e70| 65 6d 65 72 67 65 2d 73 | 63 72 6f 6c 6c 2d 75 70 |emerge-s|croll-up|
|00002e80| 20 74 5d 20 5b 22 53 63 | 72 6f 6c 6c 20 44 6f 77 | t] ["Sc|roll Dow|
|00002e90| 6e 22 20 65 6d 65 72 67 | 65 2d 73 63 72 6f 6c 6c |n" emerg|e-scroll|
|00002ea0| 2d 64 6f 77 6e 20 74 5d | 20 5b 22 53 63 72 6f 6c |-down t]| ["Scrol|
|00002eb0| 6c 20 4c 65 66 74 22 20 | 65 6d 65 72 67 65 2d 73 |l Left" |emerge-s|
|00002ec0| 63 72 6f 6c 6c 2d 6c 65 | 66 74 20 74 5d 20 5b 22 |croll-le|ft t] ["|
|00002ed0| 53 63 72 6f 6c 6c 20 52 | 69 67 68 74 22 20 65 6d |Scroll R|ight" em|
|00002ee0| 65 72 67 65 2d 73 63 72 | 6f 6c 6c 2d 72 69 67 68 |erge-scr|oll-righ|
|00002ef0| 74 20 74 5d 20 5b 22 53 | 63 72 6f 6c 6c 20 52 65 |t t] ["S|croll Re|
|00002f00| 73 65 74 22 20 65 6d 65 | 72 67 65 2d 73 63 72 6f |set" eme|rge-scro|
|00002f10| 6c 6c 2d 72 65 73 65 74 | 20 74 5d 29 20 22 2d 2d |ll-reset| t]) "--|
|00002f20| 2d 22 20 5b 22 53 65 6c | 65 63 74 20 41 22 20 65 |-" ["Sel|ect A" e|
|00002f30| 6d 65 72 67 65 2d 73 65 | 6c 65 63 74 2d 41 20 74 |merge-se|lect-A t|
|00002f40| 5d 20 5b 22 53 65 6c 65 | 63 74 20 42 22 20 65 6d |] ["Sele|ct B" em|
|00002f50| 65 72 67 65 2d 73 65 6c | 65 63 74 2d 42 20 74 5d |erge-sel|ect-B t]|
|00002f60| 20 5b 22 49 6e 73 65 72 | 74 20 41 22 20 65 6d 65 | ["Inser|t A" eme|
|00002f70| 72 67 65 2d 69 6e 73 65 | 72 74 2d 41 20 74 5d 20 |rge-inse|rt-A t] |
|00002f80| 5b 22 49 6e 73 65 72 74 | 20 42 22 20 65 6d 65 72 |["Insert| B" emer|
|00002f90| 67 65 2d 69 6e 73 65 72 | 74 2d 42 20 74 5d 20 5b |ge-inser|t-B t] [|
|00002fa0| 22 43 6f 70 79 20 41 20 | 61 73 20 4b 69 6c 6c 22 |"Copy A |as Kill"|
|00002fb0| 20 65 6d 65 72 67 65 2d | 63 6f 70 79 2d 61 73 2d | emerge-|copy-as-|
|00002fc0| 6b 69 6c 6c 2d 41 20 74 | 5d 20 5b 22 43 6f 70 79 |kill-A t|] ["Copy|
|00002fd0| 20 42 20 61 73 20 4b 69 | 6c 6c 22 20 65 6d 65 72 | B as Ki|ll" emer|
|00002fe0| 67 65 2d 63 6f 70 79 2d | 61 73 2d 6b 69 6c 6c 2d |ge-copy-|as-kill-|
|00002ff0| 42 20 74 5d 20 28 22 4f | 74 68 65 72 20 4d 65 72 |B t] ("O|ther Mer|
|00003000| 67 65 22 20 5b 22 43 6f | 6d 62 69 6e 65 20 56 65 |ge" ["Co|mbine Ve|
|00003010| 72 73 69 6f 6e 73 22 20 | 65 6d 65 72 67 65 2d 63 |rsions" |emerge-c|
|00003020| 6f 6d 62 69 6e 65 2d 76 | 65 72 73 69 6f 6e 73 20 |ombine-v|ersions |
|00003030| 74 5d 20 5b 22 54 72 69 | 6d 20 44 69 66 66 65 72 |t] ["Tri|m Differ|
|00003040| 65 6e 63 65 22 20 65 6d | 65 72 67 65 2d 74 72 69 |ence" em|erge-tri|
|00003050| 6d 2d 64 69 66 66 65 72 | 65 6e 63 65 20 74 5d 20 |m-differ|ence t] |
|00003060| 5b 22 4a 6f 69 6e 20 44 | 69 66 66 65 72 65 6e 63 |["Join D|ifferenc|
|00003070| 65 73 22 20 65 6d 65 72 | 67 65 2d 6a 6f 69 6e 2d |es" emer|ge-join-|
|00003080| 64 69 66 66 65 72 65 6e | 63 65 73 20 74 5d 20 5b |differen|ces t] [|
|00003090| 22 53 70 6c 69 74 20 44 | 69 66 66 65 72 65 6e 63 |"Split D|ifferenc|
|000030a0| 65 22 20 65 6d 65 72 67 | 65 2d 73 70 6c 69 74 2d |e" emerg|e-split-|
|000030b0| 64 69 66 66 65 72 65 6e | 63 65 20 74 5d 29 20 22 |differen|ce t]) "|
|000030c0| 2d 2d 2d 22 20 28 22 4f | 70 74 69 6f 6e 73 22 20 |---" ("O|ptions" |
|000030d0| 5b 22 46 61 73 74 20 4d | 6f 64 65 22 20 65 6d 65 |["Fast M|ode" eme|
|000030e0| 72 67 65 2d 66 61 73 74 | 2d 6d 6f 64 65 20 74 5d |rge-fast|-mode t]|
|000030f0| 20 5b 22 45 64 69 74 20 | 4d 6f 64 65 22 20 65 6d | ["Edit |Mode" em|
|00003100| 65 72 67 65 2d 65 64 69 | 74 2d 6d 6f 64 65 20 74 |erge-edi|t-mode t|
|00003110| 5d 20 5b 22 41 75 74 6f | 20 41 64 76 61 6e 63 65 |] ["Auto| Advance|
|00003120| 22 20 65 6d 65 72 67 65 | 2d 61 75 74 6f 2d 61 64 |" emerge|-auto-ad|
|00003130| 76 61 6e 63 65 20 74 5d | 20 5b 22 53 6b 69 70 20 |vance t]| ["Skip |
|00003140| 50 72 65 66 65 72 73 22 | 20 65 6d 65 72 67 65 2d |Prefers"| emerge-|
|00003150| 73 6b 69 70 2d 70 72 65 | 66 65 72 73 20 74 5d 20 |skip-pre|fers t] |
|00003160| 5b 22 44 65 66 61 75 6c | 74 20 41 22 20 65 6d 65 |["Defaul|t A" eme|
|00003170| 72 67 65 2d 64 65 66 61 | 75 6c 74 2d 41 20 74 5d |rge-defa|ult-A t]|
|00003180| 20 5b 22 44 65 66 61 75 | 6c 74 20 42 22 20 65 6d | ["Defau|lt B" em|
|00003190| 65 72 67 65 2d 64 65 66 | 61 75 6c 74 2d 42 20 74 |erge-def|ault-B t|
|000031a0| 5d 20 5b 22 53 65 74 20 | 43 6f 6d 62 69 6e 65 20 |] ["Set |Combine |
|000031b0| 54 65 6d 70 6c 61 74 65 | 2e 2e 2e 22 20 65 6d 65 |Template|..." eme|
|000031c0| 72 67 65 2d 73 65 74 2d | 63 6f 6d 62 69 6e 65 2d |rge-set-|combine-|
|000031d0| 74 65 6d 70 6c 61 74 65 | 20 74 5d 20 5b 22 53 65 |template| t] ["Se|
|000031e0| 74 20 4d 65 72 67 65 20 | 4d 6f 64 65 22 20 65 6d |t Merge |Mode" em|
|000031f0| 65 72 67 65 2d 73 65 74 | 2d 6d 65 72 67 65 2d 6d |erge-set|-merge-m|
|00003200| 6f 64 65 20 74 5d 20 5b | 22 4f 6e 65 20 4c 69 6e |ode t] [|"One Lin|
|00003210| 65 20 57 69 6e 64 6f 77 | 22 20 65 6d 65 72 67 65 |e Window|" emerge|
|00003220| 2d 6f 6e 65 2d 6c 69 6e | 65 2d 77 69 6e 64 6f 77 |-one-lin|e-window|
|00003230| 20 74 5d 29 20 5b 22 41 | 62 6f 72 74 22 20 65 6d | t]) ["A|bort" em|
|00003240| 65 72 67 65 2d 61 62 6f | 72 74 20 74 5d 20 5b 22 |erge-abo|rt t] ["|
|00003250| 51 75 69 74 22 20 65 6d | 65 72 67 65 2d 71 75 69 |Quit" em|erge-qui|
|00003260| 74 20 74 5d 29 20 28 23 | 24 20 2e 20 31 31 35 31 |t t]) (#|$ . 1151|
|00003270| 39 29 29 0a 23 40 32 38 | 20 49 6e 64 69 63 61 74 |9)).#@28| Indicat|
|00003280| 6f 72 20 66 6f 72 20 65 | 6d 65 72 67 65 2d 6d 6f |or for e|merge-mo|
|00003290| 64 65 2e 1f 0a 28 64 65 | 66 76 61 72 20 65 6d 65 |de...(de|fvar eme|
|000032a0| 72 67 65 2d 6d 6f 64 65 | 20 6e 69 6c 20 28 23 24 |rge-mode| nil (#$|
|000032b0| 20 2e 20 31 32 39 32 31 | 29 29 0a 28 62 79 74 65 | . 12921|)).(byte|
|000032c0| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 0b ab 83 |-code ".|.!......|
|000032d0| c4 aa 81 c5 c6 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|000032e0| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|000032f0| 6f 63 61 6c 20 65 6d 65 | 72 67 65 2d 6d 6f 64 65 |ocal eme|rge-mode|
|00003300| 20 70 75 74 20 65 6d 65 | 72 67 65 2d 78 65 6d 61 | put eme|rge-xema|
|00003310| 63 73 2d 70 20 70 65 72 | 6d 61 6e 65 6e 74 2d 6c |cs-p per|manent-l|
|00003320| 6f 63 61 6c 20 70 72 65 | 73 65 72 76 65 64 20 74 |ocal pre|served t|
|00003330| 5d 20 34 29 0a 23 40 34 | 31 20 49 6e 64 69 63 61 |] 4).#@4|1 Indica|
|00003340| 74 6f 72 20 66 6f 72 20 | 65 6d 65 72 67 65 2d 6d |tor for |emerge-m|
|00003350| 6f 64 65 20 66 61 73 74 | 20 73 75 62 6d 6f 64 65 |ode fast| submode|
|00003360| 2e 1f 0a 28 64 65 66 76 | 61 72 20 65 6d 65 72 67 |...(defv|ar emerg|
|00003370| 65 2d 66 61 73 74 2d 6d | 6f 64 65 20 6e 69 6c 20 |e-fast-m|ode nil |
|00003380| 28 23 24 20 2e 20 31 33 | 31 31 34 29 29 0a 28 62 |(#$ . 13|114)).(b|
|00003390| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 21 88 c2 c1 |yte-code| "..!...|
|000033a0| 0b ab 83 c4 aa 81 c5 c6 | 23 87 22 20 5b 6d 61 6b |........|#." [mak|
|000033b0| 65 2d 76 61 72 69 61 62 | 6c 65 2d 62 75 66 66 65 |e-variab|le-buffe|
|000033c0| 72 2d 6c 6f 63 61 6c 20 | 65 6d 65 72 67 65 2d 66 |r-local |emerge-f|
|000033d0| 61 73 74 2d 6d 6f 64 65 | 20 70 75 74 20 65 6d 65 |ast-mode| put eme|
|000033e0| 72 67 65 2d 78 65 6d 61 | 63 73 2d 70 20 70 65 72 |rge-xema|cs-p per|
|000033f0| 6d 61 6e 65 6e 74 2d 6c | 6f 63 61 6c 20 70 72 65 |manent-l|ocal pre|
|00003400| 73 65 72 76 65 64 20 74 | 5d 20 34 29 0a 23 40 34 |served t|] 4).#@4|
|00003410| 31 20 49 6e 64 69 63 61 | 74 6f 72 20 66 6f 72 20 |1 Indica|tor for |
|00003420| 65 6d 65 72 67 65 2d 6d | 6f 64 65 20 65 64 69 74 |emerge-m|ode edit|
|00003430| 20 73 75 62 6d 6f 64 65 | 2e 1f 0a 28 64 65 66 76 | submode|...(defv|
|00003440| 61 72 20 65 6d 65 72 67 | 65 2d 65 64 69 74 2d 6d |ar emerg|e-edit-m|
|00003450| 6f 64 65 20 6e 69 6c 20 | 28 23 24 20 2e 20 31 33 |ode nil |(#$ . 13|
|00003460| 33 33 30 29 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |330)).(b|yte-code|
|00003470| 20 22 c0 c1 21 88 c2 c1 | 0b ab 83 c4 aa 81 c5 c6 | "..!...|........|
|00003480| 23 87 22 20 5b 6d 61 6b | 65 2d 76 61 72 69 61 62 |#." [mak|e-variab|
|00003490| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 20 |le-buffe|r-local |
|000034a0| 65 6d 65 72 67 65 2d 65 | 64 69 74 2d 6d 6f 64 65 |emerge-e|dit-mode|
|000034b0| 20 70 75 74 20 65 6d 65 | 72 67 65 2d 78 65 6d 61 | put eme|rge-xema|
|000034c0| 63 73 2d 70 20 70 65 72 | 6d 61 6e 65 6e 74 2d 6c |cs-p per|manent-l|
|000034d0| 6f 63 61 6c 20 70 72 65 | 73 65 72 76 65 64 20 74 |ocal pre|served t|
|000034e0| 5d 20 34 29 0a 23 40 34 | 36 20 54 68 65 20 62 75 |] 4).#@4|6 The bu|
|000034f0| 66 66 65 72 20 69 6e 20 | 77 68 69 63 68 20 74 68 |ffer in |which th|
|00003500| 65 20 41 20 76 61 72 69 | 61 6e 74 20 69 73 20 73 |e A vari|ant is s|
|00003510| 74 6f 72 65 64 2e 1f 0a | 28 64 65 66 76 61 72 20 |tored...|(defvar |
|00003520| 65 6d 65 72 67 65 2d 41 | 2d 62 75 66 66 65 72 20 |emerge-A|-buffer |
|00003530| 6e 69 6c 20 28 23 24 20 | 2e 20 31 33 35 34 36 29 |nil (#$ |. 13546)|
|00003540| 29 0a 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 c1 |).(byte-|code "..|
|00003550| 21 88 c2 c1 0b ab 83 c4 | aa 81 c5 c6 23 87 22 20 |!.......|....#." |
|00003560| 5b 6d 61 6b 65 2d 76 61 | 72 69 61 62 6c 65 2d 62 |[make-va|riable-b|
|00003570| 75 66 66 65 72 2d 6c 6f | 63 61 6c 20 65 6d 65 72 |uffer-lo|cal emer|
|00003580| 67 65 2d 41 2d 62 75 66 | 66 65 72 20 70 75 74 20 |ge-A-buf|fer put |
|00003590| 65 6d 65 72 67 65 2d 78 | 65 6d 61 63 73 2d 70 20 |emerge-x|emacs-p |
|000035a0| 70 65 72 6d 61 6e 65 6e | 74 2d 6c 6f 63 61 6c 20 |permanen|t-local |
|000035b0| 70 72 65 73 65 72 76 65 | 64 20 74 5d 20 34 29 0a |preserve|d t] 4).|
|000035c0| 23 40 34 36 20 54 68 65 | 20 62 75 66 66 65 72 20 |#@46 The| buffer |
|000035d0| 69 6e 20 77 68 69 63 68 | 20 74 68 65 20 42 20 76 |in which| the B v|
|000035e0| 61 72 69 61 6e 74 20 69 | 73 20 73 74 6f 72 65 64 |ariant i|s stored|
|000035f0| 2e 1f 0a 28 64 65 66 76 | 61 72 20 65 6d 65 72 67 |...(defv|ar emerg|
|00003600| 65 2d 42 2d 62 75 66 66 | 65 72 20 6e 69 6c 20 28 |e-B-buff|er nil (|
|00003610| 23 24 20 2e 20 31 33 37 | 36 35 29 29 0a 28 62 79 |#$ . 137|65)).(by|
|00003620| 74 65 2d 63 6f 64 65 20 | 22 c0 c1 21 88 c2 c1 0b |te-code |"..!....|
|00003630| ab 83 c4 aa 81 c5 c6 23 | 87 22 20 5b 6d 61 6b 65 |.......#|." [make|
|00003640| 2d 76 61 72 69 61 62 6c | 65 2d 62 75 66 66 65 72 |-variabl|e-buffer|
|00003650| 2d 6c 6f 63 61 6c 20 65 | 6d 65 72 67 65 2d 42 2d |-local e|merge-B-|
|00003660| 62 75 66 66 65 72 20 70 | 75 74 20 65 6d 65 72 67 |buffer p|ut emerg|
|00003670| 65 2d 78 65 6d 61 63 73 | 2d 70 20 70 65 72 6d 61 |e-xemacs|-p perma|
|00003680| 6e 65 6e 74 2d 6c 6f 63 | 61 6c 20 70 72 65 73 65 |nent-loc|al prese|
|00003690| 72 76 65 64 20 74 5d 20 | 34 29 0a 23 40 35 33 20 |rved t] |4).#@53 |
|000036a0| 54 68 65 20 62 75 66 66 | 65 72 20 69 6e 20 77 68 |The buff|er in wh|
|000036b0| 69 63 68 20 74 68 65 20 | 6d 65 72 67 65 64 20 66 |ich the |merged f|
|000036c0| 69 6c 65 20 69 73 20 6d | 61 6e 69 70 75 6c 61 74 |ile is m|anipulat|
|000036d0| 65 64 2e 1f 0a 28 64 65 | 66 76 61 72 20 65 6d 65 |ed...(de|fvar eme|
|000036e0| 72 67 65 2d 6d 65 72 67 | 65 2d 62 75 66 66 65 72 |rge-merg|e-buffer|
|000036f0| 20 6e 69 6c 20 28 23 24 | 20 2e 20 31 33 39 38 34 | nil (#$| . 13984|
|00003700| 29 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |)).(byte|-code ".|
|00003710| c1 21 88 c2 c1 0b ab 83 | c4 aa 81 c5 c6 23 87 22 |.!......|.....#."|
|00003720| 20 5b 6d 61 6b 65 2d 76 | 61 72 69 61 62 6c 65 2d | [make-v|ariable-|
|00003730| 62 75 66 66 65 72 2d 6c | 6f 63 61 6c 20 65 6d 65 |buffer-l|ocal eme|
|00003740| 72 67 65 2d 6d 65 72 67 | 65 2d 62 75 66 66 65 72 |rge-merg|e-buffer|
|00003750| 20 70 75 74 20 65 6d 65 | 72 67 65 2d 78 65 6d 61 | put eme|rge-xema|
|00003760| 63 73 2d 70 20 70 65 72 | 6d 61 6e 65 6e 74 2d 6c |cs-p per|manent-l|
|00003770| 6f 63 61 6c 20 70 72 65 | 73 65 72 76 65 64 20 74 |ocal pre|served t|
|00003780| 5d 20 34 29 0a 23 40 37 | 38 20 54 68 65 20 62 75 |] 4).#@7|8 The bu|
|00003790| 66 66 65 72 20 69 6e 20 | 77 68 69 63 68 20 74 68 |ffer in |which th|
|000037a0| 65 20 61 6e 63 65 73 74 | 6f 72 20 76 61 72 69 61 |e ancest|or varia|
|000037b0| 6e 74 20 69 73 20 73 74 | 6f 72 65 64 2c 0a 6f 72 |nt is st|ored,.or|
|000037c0| 20 6e 69 6c 20 69 66 20 | 74 68 65 72 65 20 69 73 | nil if |there is|
|000037d0| 20 6e 6f 6e 65 2e 1f 0a | 28 64 65 66 76 61 72 20 | none...|(defvar |
|000037e0| 65 6d 65 72 67 65 2d 61 | 6e 63 65 73 74 6f 72 2d |emerge-a|ncestor-|
|000037f0| 62 75 66 66 65 72 20 6e | 69 6c 20 28 23 24 20 2e |buffer n|il (#$ .|
|00003800| 20 31 34 32 31 38 29 29 | 0a 28 62 79 74 65 2d 63 | 14218))|.(byte-c|
|00003810| 6f 64 65 20 22 c0 c1 21 | 88 c2 c1 0b ab 83 c4 aa |ode "..!|........|
|00003820| 81 c5 c6 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00003830| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|00003840| 61 6c 20 65 6d 65 72 67 | 65 2d 61 6e 63 65 73 74 |al emerg|e-ancest|
|00003850| 6f 72 2d 62 75 66 66 65 | 72 20 70 75 74 20 65 6d |or-buffe|r put em|
|00003860| 65 72 67 65 2d 78 65 6d | 61 63 73 2d 70 20 70 65 |erge-xem|acs-p pe|
|00003870| 72 6d 61 6e 65 6e 74 2d | 6c 6f 63 61 6c 20 70 72 |rmanent-|local pr|
|00003880| 65 73 65 72 76 65 64 20 | 74 5d 20 34 29 0a 23 40 |eserved |t] 4).#@|
|00003890| 39 33 20 56 61 72 69 61 | 62 6c 65 73 20 61 6e 64 |93 Varia|bles and|
|000038a0| 20 70 72 6f 70 65 72 74 | 69 65 73 20 6f 66 20 61 | propert|ies of a|
|000038b0| 20 62 75 66 66 65 72 20 | 77 68 69 63 68 20 61 72 | buffer |which ar|
|000038c0| 65 20 73 61 76 65 64 2c | 20 6d 6f 64 69 66 69 65 |e saved,| modifie|
|000038d0| 64 20 61 6e 64 20 72 65 | 73 74 6f 72 65 64 0a 64 |d and re|stored.d|
|000038e0| 75 72 69 6e 67 20 61 20 | 6d 65 72 67 65 2e 1f 0a |uring a |merge...|
|000038f0| 28 64 65 66 63 6f 6e 73 | 74 20 65 6d 65 72 67 65 |(defcons|t emerge|
|00003900| 2d 73 61 76 65 64 2d 76 | 61 72 69 61 62 6c 65 73 |-saved-v|ariables|
|00003910| 20 27 28 28 62 75 66 66 | 65 72 2d 6d 6f 64 69 66 | '((buff|er-modif|
|00003920| 69 65 64 2d 70 20 73 65 | 74 2d 62 75 66 66 65 72 |ied-p se|t-buffer|
|00003930| 2d 6d 6f 64 69 66 69 65 | 64 2d 70 29 20 62 75 66 |-modifie|d-p) buf|
|00003940| 66 65 72 2d 72 65 61 64 | 2d 6f 6e 6c 79 20 62 75 |fer-read|-only bu|
|00003950| 66 66 65 72 2d 61 75 74 | 6f 2d 73 61 76 65 2d 66 |ffer-aut|o-save-f|
|00003960| 69 6c 65 2d 6e 61 6d 65 | 29 20 28 23 24 20 2e 20 |ile-name|) (#$ . |
|00003970| 31 34 34 38 33 29 29 0a | 23 40 36 35 20 56 61 6c |14483)).|#@65 Val|
|00003980| 75 65 73 20 74 6f 20 62 | 65 20 61 73 73 69 67 6e |ues to b|e assign|
|00003990| 65 64 20 74 6f 20 65 6d | 65 72 67 65 2d 73 61 76 |ed to em|erge-sav|
|000039a0| 65 64 2d 76 61 72 69 61 | 62 6c 65 73 20 64 75 72 |ed-varia|bles dur|
|000039b0| 69 6e 67 20 61 20 6d 65 | 72 67 65 2e 1f 0a 28 64 |ing a me|rge...(d|
|000039c0| 65 66 63 6f 6e 73 74 20 | 65 6d 65 72 67 65 2d 6d |efconst |emerge-m|
|000039d0| 65 72 67 69 6e 67 2d 76 | 61 6c 75 65 73 20 27 28 |erging-v|alues '(|
|000039e0| 6e 69 6c 20 74 20 6e 69 | 6c 29 20 28 23 24 20 2e |nil t ni|l) (#$ .|
|000039f0| 20 31 34 37 31 37 29 29 | 0a 23 40 35 35 20 52 65 | 14717))|.#@55 Re|
|00003a00| 6d 65 6d 62 65 72 73 20 | 65 6d 65 72 67 65 2d 73 |members |emerge-s|
|00003a10| 61 76 65 64 2d 76 61 72 | 69 61 62 6c 65 73 20 66 |aved-var|iables f|
|00003a20| 6f 72 20 65 6d 65 72 67 | 65 2d 41 2d 62 75 66 66 |or emerg|e-A-buff|
|00003a30| 65 72 2e 1f 0a 28 64 65 | 66 76 61 72 20 65 6d 65 |er...(de|fvar eme|
|00003a40| 72 67 65 2d 41 2d 62 75 | 66 66 65 72 2d 76 61 6c |rge-A-bu|ffer-val|
|00003a50| 75 65 73 20 6e 69 6c 20 | 28 23 24 20 2e 20 31 34 |ues nil |(#$ . 14|
|00003a60| 38 34 36 29 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |846)).(b|yte-code|
|00003a70| 20 22 c0 c1 21 88 c2 c1 | 0b ab 83 c4 aa 81 c5 c6 | "..!...|........|
|00003a80| 23 87 22 20 5b 6d 61 6b | 65 2d 76 61 72 69 61 62 |#." [mak|e-variab|
|00003a90| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 20 |le-buffe|r-local |
|00003aa0| 65 6d 65 72 67 65 2d 41 | 2d 62 75 66 66 65 72 2d |emerge-A|-buffer-|
|00003ab0| 76 61 6c 75 65 73 20 70 | 75 74 20 65 6d 65 72 67 |values p|ut emerg|
|00003ac0| 65 2d 78 65 6d 61 63 73 | 2d 70 20 70 65 72 6d 61 |e-xemacs|-p perma|
|00003ad0| 6e 65 6e 74 2d 6c 6f 63 | 61 6c 20 70 72 65 73 65 |nent-loc|al prese|
|00003ae0| 72 76 65 64 20 74 5d 20 | 34 29 0a 23 40 35 35 20 |rved t] |4).#@55 |
|00003af0| 52 65 6d 65 6d 62 65 72 | 73 20 65 6d 65 72 67 65 |Remember|s emerge|
|00003b00| 2d 73 61 76 65 64 2d 76 | 61 72 69 61 62 6c 65 73 |-saved-v|ariables|
|00003b10| 20 66 6f 72 20 65 6d 65 | 72 67 65 2d 42 2d 62 75 | for eme|rge-B-bu|
|00003b20| 66 66 65 72 2e 1f 0a 28 | 64 65 66 76 61 72 20 65 |ffer...(|defvar e|
|00003b30| 6d 65 72 67 65 2d 42 2d | 62 75 66 66 65 72 2d 76 |merge-B-|buffer-v|
|00003b40| 61 6c 75 65 73 20 6e 69 | 6c 20 28 23 24 20 2e 20 |alues ni|l (#$ . |
|00003b50| 31 35 30 38 38 29 29 0a | 28 62 79 74 65 2d 63 6f |15088)).|(byte-co|
|00003b60| 64 65 20 22 c0 c1 21 88 | c2 c1 0b ab 83 c4 aa 81 |de "..!.|........|
|00003b70| c5 c6 23 87 22 20 5b 6d | 61 6b 65 2d 76 61 72 69 |..#." [m|ake-vari|
|00003b80| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|00003b90| 6c 20 65 6d 65 72 67 65 | 2d 42 2d 62 75 66 66 65 |l emerge|-B-buffe|
|00003ba0| 72 2d 76 61 6c 75 65 73 | 20 70 75 74 20 65 6d 65 |r-values| put eme|
|00003bb0| 72 67 65 2d 78 65 6d 61 | 63 73 2d 70 20 70 65 72 |rge-xema|cs-p per|
|00003bc0| 6d 61 6e 65 6e 74 2d 6c | 6f 63 61 6c 20 70 72 65 |manent-l|ocal pre|
|00003bd0| 73 65 72 76 65 64 20 74 | 5d 20 34 29 0a 23 40 31 |served t|] 4).#@1|
|00003be0| 34 30 35 20 56 65 63 74 | 6f 72 20 6f 66 20 64 69 |405 Vect|or of di|
|00003bf0| 66 66 65 72 65 6e 63 65 | 73 20 62 65 74 77 65 65 |fference|s betwee|
|00003c00| 6e 20 74 68 65 20 76 61 | 72 69 61 6e 74 73 2c 20 |n the va|riants, |
|00003c10| 61 6e 64 20 6d 61 72 6b | 65 72 73 20 69 6e 20 74 |and mark|ers in t|
|00003c20| 68 65 20 62 75 66 66 65 | 72 73 20 74 6f 0a 73 68 |he buffe|rs to.sh|
|00003c30| 6f 77 20 77 68 65 72 65 | 20 74 68 65 79 20 61 72 |ow where| they ar|
|00003c40| 65 2e 20 20 45 61 63 68 | 20 64 69 66 66 65 72 65 |e. Each| differe|
|00003c50| 6e 63 65 20 69 73 20 72 | 65 70 72 65 73 65 6e 74 |nce is r|epresent|
|00003c60| 65 64 20 62 79 20 61 20 | 76 65 63 74 6f 72 20 6f |ed by a |vector o|
|00003c70| 66 20 73 65 76 65 6e 0a | 65 6c 65 6d 65 6e 74 73 |f seven.|elements|
|00003c80| 2e 20 20 54 68 65 20 66 | 69 72 73 74 20 74 77 6f |. The f|irst two|
|00003c90| 20 61 72 65 20 6d 61 72 | 6b 65 72 73 20 74 6f 20 | are mar|kers to |
|00003ca0| 74 68 65 20 62 65 67 69 | 6e 6e 69 6e 67 20 61 6e |the begi|nning an|
|00003cb0| 64 20 65 6e 64 20 6f 66 | 20 74 68 65 20 64 69 66 |d end of| the dif|
|00003cc0| 66 65 72 65 6e 63 65 0a | 73 65 63 74 69 6f 6e 20 |ference.|section |
|00003cd0| 69 6e 20 74 68 65 20 41 | 20 62 75 66 66 65 72 2c |in the A| buffer,|
|00003ce0| 20 74 68 65 20 73 65 63 | 6f 6e 64 20 74 77 6f 20 | the sec|ond two |
|00003cf0| 61 72 65 20 6d 61 72 6b | 65 72 73 20 66 6f 72 20 |are mark|ers for |
|00003d00| 74 68 65 20 42 20 62 75 | 66 66 65 72 2c 20 74 68 |the B bu|ffer, th|
|00003d10| 65 20 74 68 69 72 64 0a | 74 77 6f 20 61 72 65 20 |e third.|two are |
|00003d20| 6d 61 72 6b 65 72 73 20 | 66 6f 72 20 74 68 65 20 |markers |for the |
|00003d30| 6d 65 72 67 65 20 62 75 | 66 66 65 72 2c 20 61 6e |merge bu|ffer, an|
|00003d40| 64 20 74 68 65 20 6c 61 | 73 74 20 65 6c 65 6d 65 |d the la|st eleme|
|00003d50| 6e 74 20 69 73 20 74 68 | 65 20 22 73 74 61 74 65 |nt is th|e "state|
|00003d60| 22 20 6f 66 0a 74 68 61 | 74 20 64 69 66 66 65 72 |" of.tha|t differ|
|00003d70| 65 6e 63 65 20 69 6e 20 | 74 68 65 20 6d 65 72 67 |ence in |the merg|
|00003d80| 65 20 62 75 66 66 65 72 | 2e 0a 20 20 41 20 73 65 |e buffer|.. A se|
|00003d90| 63 74 69 6f 6e 20 6f 66 | 20 61 20 62 75 66 66 65 |ction of| a buffe|
|00003da0| 72 20 69 73 20 64 65 73 | 63 72 69 62 65 64 20 62 |r is des|cribed b|
|00003db0| 79 20 74 77 6f 20 6d 61 | 72 6b 65 72 73 2c 20 6f |y two ma|rkers, o|
|00003dc0| 6e 65 20 74 6f 20 74 68 | 65 20 62 65 67 69 6e 6e |ne to th|e beginn|
|00003dd0| 69 6e 67 20 6f 66 0a 74 | 68 65 20 66 69 72 73 74 |ing of.t|he first|
|00003de0| 20 6c 69 6e 65 20 6f 66 | 20 74 68 65 20 73 65 63 | line of| the sec|
|00003df0| 74 69 6f 6e 2c 20 61 6e | 64 20 6f 6e 65 20 74 6f |tion, an|d one to|
|00003e00| 20 74 68 65 20 62 65 67 | 69 6e 6e 69 6e 67 20 6f | the beg|inning o|
|00003e10| 66 20 74 68 65 20 66 69 | 72 73 74 20 6c 69 6e 65 |f the fi|rst line|
|00003e20| 0a 61 66 74 65 72 20 74 | 68 65 20 73 65 63 74 69 |.after t|he secti|
|00003e30| 6f 6e 2e 20 20 28 49 66 | 20 74 68 65 20 73 65 63 |on. (If| the sec|
|00003e40| 74 69 6f 6e 20 69 73 20 | 65 6d 70 74 79 2c 20 62 |tion is |empty, b|
|00003e50| 6f 74 68 20 6d 61 72 6b | 65 72 73 20 70 6f 69 6e |oth mark|ers poin|
|00003e60| 74 20 74 6f 20 74 68 65 | 20 73 61 6d 65 0a 70 6f |t to the| same.po|
|00003e70| 69 6e 74 2e 29 20 20 49 | 66 20 74 68 65 20 73 65 |int.) I|f the se|
|00003e80| 63 74 69 6f 6e 20 69 73 | 20 70 61 72 74 20 6f 66 |ction is| part of|
|00003e90| 20 74 68 65 20 73 65 6c | 65 63 74 65 64 20 64 69 | the sel|ected di|
|00003ea0| 66 66 65 72 65 6e 63 65 | 2c 20 74 68 65 6e 20 74 |fference|, then t|
|00003eb0| 68 65 20 6d 61 72 6b 65 | 72 73 0a 61 72 65 20 6d |he marke|rs.are m|
|00003ec0| 6f 76 65 64 20 69 6e 74 | 6f 20 74 68 65 20 66 6c |oved int|o the fl|
|00003ed0| 61 67 73 2c 20 73 6f 20 | 74 68 65 20 75 73 65 72 |ags, so |the user|
|00003ee0| 20 63 61 6e 20 65 64 69 | 74 20 74 68 65 20 73 65 | can edi|t the se|
|00003ef0| 63 74 69 6f 6e 20 77 69 | 74 68 6f 75 74 20 64 69 |ction wi|thout di|
|00003f00| 73 74 75 72 62 69 6e 67 | 0a 74 68 65 20 6d 61 72 |sturbing|.the mar|
|00003f10| 6b 65 72 73 2e 0a 20 20 | 54 68 65 20 22 73 74 61 |kers.. |The "sta|
|00003f20| 74 65 73 22 20 61 72 65 | 3a 0a 09 41 09 09 74 68 |tes" are|:..A..th|
|00003f30| 65 20 6d 65 72 67 65 20 | 62 75 66 66 65 72 20 63 |e merge |buffer c|
|00003f40| 75 72 72 65 6e 74 6c 79 | 20 63 6f 6e 74 61 69 6e |urrently| contain|
|00003f50| 73 20 74 68 65 20 41 20 | 76 61 72 69 61 6e 74 0a |s the A |variant.|
|00003f60| 09 42 09 09 74 68 65 20 | 6d 65 72 67 65 20 62 75 |.B..the |merge bu|
|00003f70| 66 66 65 72 20 63 75 72 | 72 65 6e 74 6c 79 20 63 |ffer cur|rently c|
|00003f80| 6f 6e 74 61 69 6e 73 20 | 74 68 65 20 42 20 76 61 |ontains |the B va|
|00003f90| 72 69 61 6e 74 0a 09 64 | 65 66 61 75 6c 74 2d 41 |riant..d|efault-A|
|00003fa0| 09 74 68 65 20 6d 65 72 | 67 65 20 62 75 66 66 65 |.the mer|ge buffe|
|00003fb0| 72 20 63 6f 6e 74 61 69 | 6e 73 20 74 68 65 20 41 |r contai|ns the A|
|00003fc0| 20 76 61 72 69 61 6e 74 | 20 62 79 20 64 65 66 61 | variant| by defa|
|00003fd0| 75 6c 74 2c 0a 09 09 09 | 62 75 74 20 74 68 69 73 |ult,....|but this|
|00003fe0| 20 64 69 66 66 65 72 65 | 6e 63 65 20 68 61 73 6e | differe|nce hasn|
|00003ff0| 27 74 20 62 65 65 6e 20 | 73 65 6c 65 63 74 65 64 |'t been |selected|
|00004000| 20 79 65 74 2c 20 73 6f | 0a 09 09 09 63 68 61 6e | yet, so|....chan|
|00004010| 67 65 2d 64 65 66 61 75 | 6c 74 20 63 6f 6d 6d 61 |ge-defau|lt comma|
|00004020| 6e 64 73 20 63 61 6e 20 | 61 6c 74 65 72 20 69 74 |nds can |alter it|
|00004030| 0a 09 64 65 66 61 75 6c | 74 2d 42 09 74 68 65 20 |..defaul|t-B.the |
|00004040| 6d 65 72 67 65 20 62 75 | 66 66 65 72 20 63 6f 6e |merge bu|ffer con|
|00004050| 74 61 69 6e 73 20 74 68 | 65 20 42 20 76 61 72 69 |tains th|e B vari|
|00004060| 61 6e 74 20 62 79 20 64 | 65 66 61 75 6c 74 2c 0a |ant by d|efault,.|
|00004070| 09 09 09 62 75 74 20 74 | 68 69 73 20 64 69 66 66 |...but t|his diff|
|00004080| 65 72 65 6e 63 65 20 68 | 61 73 6e 27 74 20 62 65 |erence h|asn't be|
|00004090| 65 6e 20 73 65 6c 65 63 | 74 65 64 20 79 65 74 2c |en selec|ted yet,|
|000040a0| 20 73 6f 0a 09 09 09 63 | 68 61 6e 67 65 2d 64 65 | so....c|hange-de|
|000040b0| 66 61 75 6c 74 20 63 6f | 6d 6d 61 6e 64 73 20 63 |fault co|mmands c|
|000040c0| 61 6e 20 61 6c 74 65 72 | 20 69 74 0a 09 70 72 65 |an alter| it..pre|
|000040d0| 66 65 72 2d 41 09 69 6e | 20 61 20 74 68 72 65 65 |fer-A.in| a three|
|000040e0| 2d 66 69 6c 65 20 6d 65 | 72 67 65 2c 20 74 68 65 |-file me|rge, the|
|000040f0| 20 41 20 76 61 72 69 61 | 6e 74 20 69 73 20 74 68 | A varia|nt is th|
|00004100| 65 20 70 72 65 66 65 72 | 72 65 64 0a 09 09 09 63 |e prefer|red....c|
|00004110| 68 6f 69 63 65 0a 09 70 | 72 65 66 65 72 2d 42 09 |hoice..p|refer-B.|
|00004120| 69 6e 20 61 20 74 68 72 | 65 65 2d 66 69 6c 65 20 |in a thr|ee-file |
|00004130| 6d 65 72 67 65 2c 20 74 | 68 65 20 42 20 76 61 72 |merge, t|he B var|
|00004140| 69 61 6e 74 20 69 73 20 | 74 68 65 20 70 72 65 66 |iant is |the pref|
|00004150| 65 72 72 65 64 0a 09 09 | 09 63 68 6f 69 63 65 1f |erred...|.choice.|
|00004160| 0a 28 64 65 66 76 61 72 | 20 65 6d 65 72 67 65 2d |.(defvar| emerge-|
|00004170| 64 69 66 66 65 72 65 6e | 63 65 2d 6c 69 73 74 20 |differen|ce-list |
|00004180| 6e 69 6c 20 28 23 24 20 | 2e 20 31 35 33 33 32 29 |nil (#$ |. 15332)|
|00004190| 29 0a 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 c1 |).(byte-|code "..|
|000041a0| 21 88 c2 c1 0b ab 83 c4 | aa 81 c5 c6 23 87 22 20 |!.......|....#." |
|000041b0| 5b 6d 61 6b 65 2d 76 61 | 72 69 61 62 6c 65 2d 62 |[make-va|riable-b|
|000041c0| 75 66 66 65 72 2d 6c 6f | 63 61 6c 20 65 6d 65 72 |uffer-lo|cal emer|
|000041d0| 67 65 2d 64 69 66 66 65 | 72 65 6e 63 65 2d 6c 69 |ge-diffe|rence-li|
|000041e0| 73 74 20 70 75 74 20 65 | 6d 65 72 67 65 2d 78 65 |st put e|merge-xe|
|000041f0| 6d 61 63 73 2d 70 20 70 | 65 72 6d 61 6e 65 6e 74 |macs-p p|ermanent|
|00004200| 2d 6c 6f 63 61 6c 20 70 | 72 65 73 65 72 76 65 64 |-local p|reserved|
|00004210| 20 74 5d 20 34 29 0a 23 | 40 34 34 20 54 68 65 20 | t] 4).#|@44 The |
|00004220| 64 69 66 66 65 72 65 6e | 63 65 20 74 68 61 74 20 |differen|ce that |
|00004230| 69 73 20 63 75 72 72 65 | 6e 74 6c 79 20 73 65 6c |is curre|ntly sel|
|00004240| 65 63 74 65 64 2e 1f 0a | 28 64 65 66 76 61 72 20 |ected...|(defvar |
|00004250| 65 6d 65 72 67 65 2d 63 | 75 72 72 65 6e 74 2d 64 |emerge-c|urrent-d|
|00004260| 69 66 66 65 72 65 6e 63 | 65 20 2d 31 20 28 23 24 |ifferenc|e -1 (#$|
|00004270| 20 2e 20 31 36 39 32 34 | 29 29 0a 28 62 79 74 65 | . 16924|)).(byte|
|00004280| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 0b ab 83 |-code ".|.!......|
|00004290| c4 aa 81 c5 c6 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|000042a0| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|000042b0| 6f 63 61 6c 20 65 6d 65 | 72 67 65 2d 63 75 72 72 |ocal eme|rge-curr|
|000042c0| 65 6e 74 2d 64 69 66 66 | 65 72 65 6e 63 65 20 70 |ent-diff|erence p|
|000042d0| 75 74 20 65 6d 65 72 67 | 65 2d 78 65 6d 61 63 73 |ut emerg|e-xemacs|
|000042e0| 2d 70 20 70 65 72 6d 61 | 6e 65 6e 74 2d 6c 6f 63 |-p perma|nent-loc|
|000042f0| 61 6c 20 70 72 65 73 65 | 72 76 65 64 20 74 5d 20 |al prese|rved t] |
|00004300| 34 29 0a 23 40 33 30 20 | 4e 75 6d 62 65 72 20 6f |4).#@30 |Number o|
|00004310| 66 20 64 69 66 66 65 72 | 65 6e 63 65 73 20 66 6f |f differ|ences fo|
|00004320| 75 6e 64 2e 1f 0a 28 64 | 65 66 76 61 72 20 65 6d |und...(d|efvar em|
|00004330| 65 72 67 65 2d 6e 75 6d | 62 65 72 2d 6f 66 2d 64 |erge-num|ber-of-d|
|00004340| 69 66 66 65 72 65 6e 63 | 65 73 20 6e 69 6c 20 28 |ifferenc|es nil (|
|00004350| 23 24 20 2e 20 31 37 31 | 36 30 29 29 0a 28 62 79 |#$ . 171|60)).(by|
|00004360| 74 65 2d 63 6f 64 65 20 | 22 c0 c1 21 88 c2 c1 0b |te-code |"..!....|
|00004370| ab 83 c4 aa 81 c5 c6 23 | 87 22 20 5b 6d 61 6b 65 |.......#|." [make|
|00004380| 2d 76 61 72 69 61 62 6c | 65 2d 62 75 66 66 65 72 |-variabl|e-buffer|
|00004390| 2d 6c 6f 63 61 6c 20 65 | 6d 65 72 67 65 2d 6e 75 |-local e|merge-nu|
|000043a0| 6d 62 65 72 2d 6f 66 2d | 64 69 66 66 65 72 65 6e |mber-of-|differen|
|000043b0| 63 65 73 20 70 75 74 20 | 65 6d 65 72 67 65 2d 78 |ces put |emerge-x|
|000043c0| 65 6d 61 63 73 2d 70 20 | 70 65 72 6d 61 6e 65 6e |emacs-p |permanen|
|000043d0| 74 2d 6c 6f 63 61 6c 20 | 70 72 65 73 65 72 76 65 |t-local |preserve|
|000043e0| 64 20 74 5d 20 34 29 0a | 23 40 31 38 36 20 54 68 |d t] 4).|#@186 Th|
|000043f0| 65 20 6c 6f 63 61 6c 20 | 6b 65 79 6d 61 70 20 66 |e local |keymap f|
|00004400| 6f 72 20 74 68 65 20 6d | 65 72 67 65 20 62 75 66 |or the m|erge buf|
|00004410| 66 65 72 2c 20 77 69 74 | 68 20 74 68 65 20 65 6d |fer, wit|h the em|
|00004420| 65 72 67 65 20 63 6f 6d | 6d 61 6e 64 73 20 64 65 |erge com|mands de|
|00004430| 66 69 6e 65 64 20 69 6e | 0a 69 74 2e 20 20 55 73 |fined in|.it. Us|
|00004440| 65 64 20 74 6f 20 73 61 | 76 65 20 74 68 65 20 6c |ed to sa|ve the l|
|00004450| 6f 63 61 6c 20 6b 65 79 | 6d 61 70 20 64 75 72 69 |ocal key|map duri|
|00004460| 6e 67 20 66 61 73 74 20 | 6d 6f 64 65 2c 20 77 68 |ng fast |mode, wh|
|00004470| 65 6e 20 74 68 65 20 6c | 6f 63 61 6c 20 6b 65 79 |en the l|ocal key|
|00004480| 6d 61 70 20 69 73 0a 72 | 65 70 6c 61 63 65 64 20 |map is.r|eplaced |
|00004490| 62 79 20 65 6d 65 72 67 | 65 2d 66 61 73 74 2d 6b |by emerg|e-fast-k|
|000044a0| 65 79 6d 61 70 2e 1f 0a | 28 64 65 66 76 61 72 20 |eymap...|(defvar |
|000044b0| 65 6d 65 72 67 65 2d 65 | 64 69 74 2d 6b 65 79 6d |emerge-e|dit-keym|
|000044c0| 61 70 20 6e 69 6c 20 28 | 23 24 20 2e 20 31 37 33 |ap nil (|#$ . 173|
|000044d0| 39 30 29 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |90)).(by|te-code |
|000044e0| 22 c0 c1 21 88 c2 c1 0b | ab 83 c4 aa 81 c5 c6 23 |"..!....|.......#|
|000044f0| 87 22 20 5b 6d 61 6b 65 | 2d 76 61 72 69 61 62 6c |." [make|-variabl|
|00004500| 65 2d 62 75 66 66 65 72 | 2d 6c 6f 63 61 6c 20 65 |e-buffer|-local e|
|00004510| 6d 65 72 67 65 2d 65 64 | 69 74 2d 6b 65 79 6d 61 |merge-ed|it-keyma|
|00004520| 70 20 70 75 74 20 65 6d | 65 72 67 65 2d 78 65 6d |p put em|erge-xem|
|00004530| 61 63 73 2d 70 20 70 65 | 72 6d 61 6e 65 6e 74 2d |acs-p pe|rmanent-|
|00004540| 6c 6f 63 61 6c 20 70 72 | 65 73 65 72 76 65 64 20 |local pr|eserved |
|00004550| 74 5d 20 34 29 0a 23 40 | 34 39 20 54 68 65 20 6f |t] 4).#@|49 The o|
|00004560| 72 69 67 69 6e 61 6c 20 | 6c 6f 63 61 6c 20 6b 65 |riginal |local ke|
|00004570| 79 6d 61 70 20 66 6f 72 | 20 74 68 65 20 6d 65 72 |ymap for| the mer|
|00004580| 67 65 20 62 75 66 66 65 | 72 2e 1f 0a 28 64 65 66 |ge buffe|r...(def|
|00004590| 76 61 72 20 65 6d 65 72 | 67 65 2d 6f 6c 64 2d 6b |var emer|ge-old-k|
|000045a0| 65 79 6d 61 70 20 6e 69 | 6c 20 28 23 24 20 2e 20 |eymap ni|l (#$ . |
|000045b0| 31 37 37 35 35 29 29 0a | 28 62 79 74 65 2d 63 6f |17755)).|(byte-co|
|000045c0| 64 65 20 22 c0 c1 21 88 | c2 c1 0b ab 83 c4 aa 81 |de "..!.|........|
|000045d0| c5 c6 23 87 22 20 5b 6d | 61 6b 65 2d 76 61 72 69 |..#." [m|ake-vari|
|000045e0| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|000045f0| 6c 20 65 6d 65 72 67 65 | 2d 6f 6c 64 2d 6b 65 79 |l emerge|-old-key|
|00004600| 6d 61 70 20 70 75 74 20 | 65 6d 65 72 67 65 2d 78 |map put |emerge-x|
|00004610| 65 6d 61 63 73 2d 70 20 | 70 65 72 6d 61 6e 65 6e |emacs-p |permanen|
|00004620| 74 2d 6c 6f 63 61 6c 20 | 70 72 65 73 65 72 76 65 |t-local |preserve|
|00004630| 64 20 74 5d 20 34 29 0a | 23 40 39 36 20 2a 49 66 |d t] 4).|#@96 *If|
|00004640| 20 6e 6f 6e 2d 6e 69 6c | 2c 20 65 6d 65 72 67 65 | non-nil|, emerge|
|00004650| 2d 73 65 6c 65 63 74 2d | 41 20 61 6e 64 20 65 6d |-select-|A and em|
|00004660| 65 72 67 65 2d 73 65 6c | 65 63 74 2d 42 20 61 75 |erge-sel|ect-B au|
|00004670| 74 6f 6d 61 74 69 63 61 | 6c 6c 79 20 61 64 76 61 |tomatica|lly adva|
|00004680| 6e 63 65 20 74 6f 0a 74 | 68 65 20 6e 65 78 74 20 |nce to.t|he next |
|00004690| 64 69 66 66 65 72 65 6e | 63 65 2e 1f 0a 28 64 65 |differen|ce...(de|
|000046a0| 66 76 61 72 20 65 6d 65 | 72 67 65 2d 61 75 74 6f |fvar eme|rge-auto|
|000046b0| 2d 61 64 76 61 6e 63 65 | 20 6e 69 6c 20 28 23 24 |-advance| nil (#$|
|000046c0| 20 2e 20 2d 31 37 39 38 | 31 29 29 0a 28 62 79 74 | . -1798|1)).(byt|
|000046d0| 65 2d 63 6f 64 65 20 22 | c0 c1 21 88 c2 c1 0b ab |e-code "|..!.....|
|000046e0| 83 c4 aa 81 c5 c6 23 87 | 22 20 5b 6d 61 6b 65 2d |......#.|" [make-|
|000046f0| 76 61 72 69 61 62 6c 65 | 2d 62 75 66 66 65 72 2d |variable|-buffer-|
|00004700| 6c 6f 63 61 6c 20 65 6d | 65 72 67 65 2d 61 75 74 |local em|erge-aut|
|00004710| 6f 2d 61 64 76 61 6e 63 | 65 20 70 75 74 20 65 6d |o-advanc|e put em|
|00004720| 65 72 67 65 2d 78 65 6d | 61 63 73 2d 70 20 70 65 |erge-xem|acs-p pe|
|00004730| 72 6d 61 6e 65 6e 74 2d | 6c 6f 63 61 6c 20 70 72 |rmanent-|local pr|
|00004740| 65 73 65 72 76 65 64 20 | 74 5d 20 34 29 0a 23 40 |eserved |t] 4).#@|
|00004750| 38 35 20 2a 49 66 20 6e | 6f 6e 2d 6e 69 6c 2c 20 |85 *If n|on-nil, |
|00004760| 64 69 66 66 65 72 65 6e | 63 65 73 20 66 6f 72 20 |differen|ces for |
|00004770| 77 68 69 63 68 20 74 68 | 65 72 65 20 69 73 20 61 |which th|ere is a|
|00004780| 20 70 72 65 66 65 72 65 | 6e 63 65 20 61 72 65 20 | prefere|nce are |
|00004790| 61 75 74 6f 6d 61 74 69 | 63 61 6c 6c 79 0a 73 6b |automati|cally.sk|
|000047a0| 69 70 70 65 64 2e 1f 0a | 28 64 65 66 76 61 72 20 |ipped...|(defvar |
|000047b0| 65 6d 65 72 67 65 2d 73 | 6b 69 70 2d 70 72 65 66 |emerge-s|kip-pref|
|000047c0| 65 72 73 20 6e 69 6c 20 | 28 23 24 20 2e 20 2d 31 |ers nil |(#$ . -1|
|000047d0| 38 32 35 39 29 29 0a 28 | 62 79 74 65 2d 63 6f 64 |8259)).(|byte-cod|
|000047e0| 65 20 22 c0 c1 21 88 c2 | c1 0b ab 83 c4 aa 81 c5 |e "..!..|........|
|000047f0| c6 23 87 22 20 5b 6d 61 | 6b 65 2d 76 61 72 69 61 |.#." [ma|ke-varia|
|00004800| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|00004810| 20 65 6d 65 72 67 65 2d | 73 6b 69 70 2d 70 72 65 | emerge-|skip-pre|
|00004820| 66 65 72 73 20 70 75 74 | 20 65 6d 65 72 67 65 2d |fers put| emerge-|
|00004830| 78 65 6d 61 63 73 2d 70 | 20 70 65 72 6d 61 6e 65 |xemacs-p| permane|
|00004840| 6e 74 2d 6c 6f 63 61 6c | 20 70 72 65 73 65 72 76 |nt-local| preserv|
|00004850| 65 64 20 74 5d 20 34 29 | 0a 23 40 32 32 38 20 48 |ed t] 4)|.#@228 H|
|00004860| 6f 6f 6b 73 20 74 6f 20 | 72 75 6e 20 69 6e 20 74 |ooks to |run in t|
|00004870| 68 65 20 6d 65 72 67 65 | 20 62 75 66 66 65 72 20 |he merge| buffer |
|00004880| 61 66 74 65 72 20 74 68 | 65 20 6d 65 72 67 65 20 |after th|e merge |
|00004890| 68 61 73 20 62 65 65 6e | 20 66 69 6e 69 73 68 65 |has been| finishe|
|000048a0| 64 2e 0a 60 65 6d 65 72 | 67 65 2d 70 72 65 66 69 |d..`emer|ge-prefi|
|000048b0| 78 2d 61 72 67 75 6d 65 | 6e 74 27 20 77 69 6c 6c |x-argume|nt' will|
|000048c0| 20 68 6f 6c 64 20 74 68 | 65 20 70 72 65 66 69 78 | hold th|e prefix|
|000048d0| 20 61 72 67 75 6d 65 6e | 74 20 6f 66 20 74 68 65 | argumen|t of the|
|000048e0| 20 60 65 6d 65 72 67 65 | 2d 71 75 69 74 27 0a 63 | `emerge|-quit'.c|
|000048f0| 6f 6d 6d 61 6e 64 2e 0a | 54 68 69 73 20 69 73 20 |ommand..|This is |
|00004900| 2a 6e 6f 74 2a 20 61 20 | 75 73 65 72 20 6f 70 74 |*not* a |user opt|
|00004910| 69 6f 6e 2c 20 73 69 6e | 63 65 20 45 6d 65 72 67 |ion, sin|ce Emerg|
|00004920| 65 20 75 73 65 73 20 69 | 74 20 66 6f 72 20 69 74 |e uses i|t for it|
|00004930| 73 20 6f 77 6e 20 70 72 | 6f 63 65 73 73 69 6e 67 |s own pr|ocessing|
|00004940| 2e 1f 0a 28 64 65 66 76 | 61 72 20 65 6d 65 72 67 |...(defv|ar emerg|
|00004950| 65 2d 71 75 69 74 2d 68 | 6f 6f 6b 20 6e 69 6c 20 |e-quit-h|ook nil |
|00004960| 28 23 24 20 2e 20 31 38 | 35 32 37 29 29 0a 28 62 |(#$ . 18|527)).(b|
|00004970| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 21 88 c2 c1 |yte-code| "..!...|
|00004980| 0b ab 83 c4 aa 81 c5 c6 | 23 87 22 20 5b 6d 61 6b |........|#." [mak|
|00004990| 65 2d 76 61 72 69 61 62 | 6c 65 2d 62 75 66 66 65 |e-variab|le-buffe|
|000049a0| 72 2d 6c 6f 63 61 6c 20 | 65 6d 65 72 67 65 2d 71 |r-local |emerge-q|
|000049b0| 75 69 74 2d 68 6f 6f 6b | 20 70 75 74 20 65 6d 65 |uit-hook| put eme|
|000049c0| 72 67 65 2d 78 65 6d 61 | 63 73 2d 70 20 70 65 72 |rge-xema|cs-p per|
|000049d0| 6d 61 6e 65 6e 74 2d 6c | 6f 63 61 6c 20 70 72 65 |manent-l|ocal pre|
|000049e0| 73 65 72 76 65 64 20 74 | 5d 20 34 29 0a 23 40 36 |served t|] 4).#@6|
|000049f0| 36 20 44 65 73 63 72 69 | 62 65 73 20 6f 75 74 70 |6 Descri|bes outp|
|00004a00| 75 74 20 64 65 73 74 69 | 6e 61 74 69 6f 6e 20 6f |ut desti|nation o|
|00004a10| 66 20 65 6d 65 72 67 65 | 2c 20 66 6f 72 20 60 65 |f emerge|, for `e|
|00004a20| 6d 65 72 67 65 2d 66 69 | 6c 65 2d 6e 61 6d 65 73 |merge-fi|le-names|
|00004a30| 27 2e 1f 0a 28 64 65 66 | 76 61 72 20 65 6d 65 72 |'...(def|var emer|
|00004a40| 67 65 2d 6f 75 74 70 75 | 74 2d 64 65 73 63 72 69 |ge-outpu|t-descri|
|00004a50| 70 74 69 6f 6e 20 6e 69 | 6c 20 28 23 24 20 2e 20 |ption ni|l (#$ . |
|00004a60| 31 38 39 33 30 29 29 0a | 28 62 79 74 65 2d 63 6f |18930)).|(byte-co|
|00004a70| 64 65 20 22 c0 c1 21 88 | c2 c1 0b ab 83 c4 aa 81 |de "..!.|........|
|00004a80| c5 c6 23 87 22 20 5b 6d | 61 6b 65 2d 76 61 72 69 |..#." [m|ake-vari|
|00004a90| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|00004aa0| 6c 20 65 6d 65 72 67 65 | 2d 6f 75 74 70 75 74 2d |l emerge|-output-|
|00004ab0| 64 65 73 63 72 69 70 74 | 69 6f 6e 20 70 75 74 20 |descript|ion put |
|00004ac0| 65 6d 65 72 67 65 2d 78 | 65 6d 61 63 73 2d 70 20 |emerge-x|emacs-p |
|00004ad0| 70 65 72 6d 61 6e 65 6e | 74 2d 6c 6f 63 61 6c 20 |permanen|t-local |
|00004ae0| 70 72 65 73 65 72 76 65 | 64 20 74 5d 20 34 29 0a |preserve|d t] 4).|
|00004af0| 28 64 65 66 61 6c 69 61 | 73 20 27 65 6d 65 72 67 |(defalia|s 'emerg|
|00004b00| 65 2d 66 69 6c 65 73 2d | 69 6e 74 65 72 6e 61 6c |e-files-|internal|
|00004b10| 20 23 5b 28 66 69 6c 65 | 2d 41 20 66 69 6c 65 2d | #[(file|-A file-|
|00004b20| 42 20 26 6f 70 74 69 6f | 6e 61 6c 20 73 74 61 72 |B &optio|nal star|
|00004b30| 74 75 70 2d 68 6f 6f 6b | 73 20 71 75 69 74 2d 68 |tup-hook|s quit-h|
|00004b40| 6f 6f 6b 73 20 6f 75 74 | 70 75 74 2d 66 69 6c 65 |ooks out|put-file|
|00004b50| 29 20 22 c0 09 21 ac 85 | c2 c3 09 5c 22 88 c0 0c |) "..!..|...\"...|
|00004b60| 21 ac 85 c2 c3 0c 5c 22 | 88 c5 09 21 c5 0c 21 1e |!.....\"|...!..!.|
|00004b70| 06 1e 07 c8 09 21 16 09 | c8 0c 21 16 5c 6e 0e 0b |.....!..|..!.\n..|
|00004b80| ab 86 c8 0e 0b 21 16 0c | 72 0e 07 71 88 7e 88 cd |.....!..|r..q.~..|
|00004b90| 20 ab 99 ce cf 21 11 d0 | 65 64 09 d1 d2 25 88 d3 | ....!..|ed...%..|
|00004ba0| d1 d4 09 44 45 0e 15 42 | 16 15 aa 83 d6 20 88 29 |...DE..B|..... .)|
|00004bb0| 72 0e 06 71 88 7e 88 cd | 20 ab 99 ce d7 21 14 d0 |r..q.~..| ....!..|
|00004bc0| 65 64 0c d1 d2 25 88 d3 | d1 d4 0c 44 45 0e 15 42 |ed...%..|...DE..B|
|00004bd0| 16 15 aa 83 d6 20 88 29 | d8 0e 07 09 0e 06 0c 0e |..... .)|........|
|00004be0| 15 0e 19 0e 0b 26 07 2a | 87 22 20 5b 66 69 6c 65 |.....&.*|." [file|
|00004bf0| 2d 72 65 61 64 61 62 6c | 65 2d 70 20 66 69 6c 65 |-readabl|e-p file|
|00004c00| 2d 41 20 65 72 72 6f 72 | 20 22 46 69 6c 65 20 5c |-A error| "File \|
|00004c10| 22 25 73 5c 22 20 64 6f | 65 73 20 6e 6f 74 20 65 |"%s\" do|es not e|
|00004c20| 78 69 73 74 20 6f 72 20 | 69 73 20 6e 6f 74 20 72 |xist or |is not r|
|00004c30| 65 61 64 61 62 6c 65 22 | 20 66 69 6c 65 2d 42 20 |eadable"| file-B |
|00004c40| 66 69 6e 64 2d 66 69 6c | 65 2d 6e 6f 73 65 6c 65 |find-fil|e-nosele|
|00004c50| 63 74 20 62 75 66 66 65 | 72 2d 42 20 62 75 66 66 |ct buffe|r-B buff|
|00004c60| 65 72 2d 41 20 66 69 6c | 65 2d 6e 61 6d 65 2d 64 |er-A fil|e-name-d|
|00004c70| 69 72 65 63 74 6f 72 79 | 20 65 6d 65 72 67 65 2d |irectory| emerge-|
|00004c80| 6c 61 73 74 2d 64 69 72 | 2d 41 20 65 6d 65 72 67 |last-dir|-A emerg|
|00004c90| 65 2d 6c 61 73 74 2d 64 | 69 72 2d 42 20 6f 75 74 |e-last-d|ir-B out|
|00004ca0| 70 75 74 2d 66 69 6c 65 | 20 65 6d 65 72 67 65 2d |put-file| emerge-|
|00004cb0| 6c 61 73 74 2d 64 69 72 | 2d 6f 75 74 70 75 74 20 |last-dir|-output |
|00004cc0| 65 6d 65 72 67 65 2d 72 | 65 6d 6f 74 65 2d 66 69 |emerge-r|emote-fi|
|00004cd0| 6c 65 2d 70 20 65 6d 65 | 72 67 65 2d 6d 61 6b 65 |le-p eme|rge-make|
|00004ce0| 2d 74 65 6d 70 2d 66 69 | 6c 65 20 22 41 22 20 77 |-temp-fi|le "A" w|
|00004cf0| 72 69 74 65 2d 72 65 67 | 69 6f 6e 20 6e 69 6c 20 |rite-reg|ion nil |
|00004d00| 6e 6f 2d 6d 65 73 73 61 | 67 65 20 6c 61 6d 62 64 |no-messa|ge lambd|
|00004d10| 61 20 64 65 6c 65 74 65 | 2d 66 69 6c 65 20 73 74 |a delete|-file st|
|00004d20| 61 72 74 75 70 2d 68 6f | 6f 6b 73 20 65 6d 65 72 |artup-ho|oks emer|
|00004d30| 67 65 2d 76 65 72 69 66 | 79 2d 66 69 6c 65 2d 62 |ge-verif|y-file-b|
|00004d40| 75 66 66 65 72 20 22 42 | 22 20 65 6d 65 72 67 65 |uffer "B|" emerge|
|00004d50| 2d 73 65 74 75 70 20 71 | 75 69 74 2d 68 6f 6f 6b |-setup q|uit-hook|
|00004d60| 73 5d 20 38 5d 29 0a 28 | 64 65 66 61 6c 69 61 73 |s] 8]).(|defalias|
|00004d70| 20 27 65 6d 65 72 67 65 | 2d 73 65 74 75 70 20 23 | 'emerge|-setup #|
|00004d80| 5b 28 62 75 66 66 65 72 | 2d 41 20 66 69 6c 65 2d |[(buffer|-A file-|
|00004d90| 41 20 62 75 66 66 65 72 | 2d 42 20 66 69 6c 65 2d |A buffer|-B file-|
|00004da0| 42 20 73 74 61 72 74 75 | 70 2d 68 6f 6f 6b 73 20 |B startu|p-hooks |
|00004db0| 71 75 69 74 2d 68 6f 6f | 6b 73 20 6f 75 74 70 75 |quit-hoo|ks outpu|
|00004dc0| 74 2d 66 69 6c 65 29 20 | 22 c0 09 21 11 c0 5c 6e |t-file) |"..!..\n|
|00004dd0| 21 12 0b ad 83 c0 0b 21 | 13 c4 c5 c6 5c 22 1e 07 |!......!|....\"..|
|00004de0| 72 0e 08 71 88 c9 0e 07 | 21 29 1e 5c 6e 72 0e 5c |r..q....|!).\nr.\|
|00004df0| 6e 71 88 cb 0e 08 21 88 | cc 16 0d ce cf 21 88 d0 |nq....!.|.....!..|
|00004e00| 16 11 0e 08 16 12 0e 13 | 16 14 cc 16 15 0e 5c 6e |........|......\n|
|00004e10| 16 16 0b ab 85 d7 0b 50 | aa 86 d8 d9 0e 5c 6e 21 |.......P|.....\n!|
|00004e20| 50 16 1a db 0e 12 21 88 | dc 20 88 dd 09 5c 6e 5c |P.....!.|. ...\n\|
|00004e30| 22 89 16 1e 47 16 1f e0 | 16 21 0e 5c 22 16 23 e4 |"...G...|.!.\".#.|
|00004e40| 20 88 e5 20 88 29 e6 0e | 08 0e 13 0e 5c 6e d0 24 | .. .)..|....\n.$|
|00004e50| 88 72 0e 5c 6e 71 88 e7 | e8 e9 5c 22 88 d0 89 16 |.r.\nq..|..\"....|
|00004e60| 0d 2b 87 22 20 5b 65 78 | 70 61 6e 64 2d 66 69 6c |.+." [ex|pand-fil|
|00004e70| 65 2d 6e 61 6d 65 20 66 | 69 6c 65 2d 41 20 66 69 |e-name f|ile-A fi|
|00004e80| 6c 65 2d 42 20 6f 75 74 | 70 75 74 2d 66 69 6c 65 |le-B out|put-file|
|00004e90| 20 65 6d 65 72 67 65 2d | 75 6e 69 71 75 65 2d 62 | emerge-|unique-b|
|00004ea0| 75 66 66 65 72 2d 6e 61 | 6d 65 20 22 2a 6d 65 72 |uffer-na|me "*mer|
|00004eb0| 67 65 22 20 22 2a 22 20 | 6d 65 72 67 65 2d 62 75 |ge" "*" |merge-bu|
|00004ec0| 66 66 65 72 2d 6e 61 6d | 65 20 62 75 66 66 65 72 |ffer-nam|e buffer|
|00004ed0| 2d 41 20 67 65 74 2d 62 | 75 66 66 65 72 2d 63 72 |-A get-b|uffer-cr|
|00004ee0| 65 61 74 65 20 6d 65 72 | 67 65 2d 62 75 66 66 65 |eate mer|ge-buffe|
|00004ef0| 72 20 65 6d 65 72 67 65 | 2d 63 6f 70 79 2d 6d 6f |r emerge|-copy-mo|
|00004f00| 64 65 73 20 6e 69 6c 20 | 62 75 66 66 65 72 2d 72 |des nil |buffer-r|
|00004f10| 65 61 64 2d 6f 6e 6c 79 | 20 61 75 74 6f 2d 73 61 |ead-only| auto-sa|
|00004f20| 76 65 2d 6d 6f 64 65 20 | 31 20 74 20 65 6d 65 72 |ve-mode |1 t emer|
|00004f30| 67 65 2d 6d 6f 64 65 20 | 65 6d 65 72 67 65 2d 41 |ge-mode |emerge-A|
|00004f40| 2d 62 75 66 66 65 72 20 | 62 75 66 66 65 72 2d 42 |-buffer |buffer-B|
|00004f50| 20 65 6d 65 72 67 65 2d | 42 2d 62 75 66 66 65 72 | emerge-|B-buffer|
|00004f60| 20 65 6d 65 72 67 65 2d | 61 6e 63 65 73 74 6f 72 | emerge-|ancestor|
|00004f70| 2d 62 75 66 66 65 72 20 | 65 6d 65 72 67 65 2d 6d |-buffer |emerge-m|
|00004f80| 65 72 67 65 2d 62 75 66 | 66 65 72 20 22 4f 75 74 |erge-buf|fer "Out|
|00004f90| 70 75 74 20 74 6f 20 66 | 69 6c 65 3a 20 22 20 22 |put to f|ile: " "|
|00004fa0| 4f 75 74 70 75 74 20 74 | 6f 20 62 75 66 66 65 72 |Output t|o buffer|
|00004fb0| 3a 20 22 20 62 75 66 66 | 65 72 2d 6e 61 6d 65 20 |: " buff|er-name |
|00004fc0| 65 6d 65 72 67 65 2d 6f | 75 74 70 75 74 2d 64 65 |emerge-o|utput-de|
|00004fd0| 73 63 72 69 70 74 69 6f | 6e 20 69 6e 73 65 72 74 |scriptio|n insert|
|00004fe0| 2d 62 75 66 66 65 72 20 | 65 6d 65 72 67 65 2d 73 |-buffer |emerge-s|
|00004ff0| 65 74 2d 6b 65 79 73 20 | 65 6d 65 72 67 65 2d 6d |et-keys |emerge-m|
|00005000| 61 6b 65 2d 64 69 66 66 | 2d 6c 69 73 74 20 65 6d |ake-diff|-list em|
|00005010| 65 72 67 65 2d 64 69 66 | 66 65 72 65 6e 63 65 2d |erge-dif|ference-|
|00005020| 6c 69 73 74 20 65 6d 65 | 72 67 65 2d 6e 75 6d 62 |list eme|rge-numb|
|00005030| 65 72 2d 6f 66 2d 64 69 | 66 66 65 72 65 6e 63 65 |er-of-di|fference|
|00005040| 73 20 2d 31 20 65 6d 65 | 72 67 65 2d 63 75 72 72 |s -1 eme|rge-curr|
|00005050| 65 6e 74 2d 64 69 66 66 | 65 72 65 6e 63 65 20 71 |ent-diff|erence q|
|00005060| 75 69 74 2d 68 6f 6f 6b | 73 20 65 6d 65 72 67 65 |uit-hook|s emerge|
|00005070| 2d 71 75 69 74 2d 68 6f | 6f 6b 20 65 6d 65 72 67 |-quit-ho|ok emerg|
|00005080| 65 2d 72 65 6d 65 6d 62 | 65 72 2d 62 75 66 66 65 |e-rememb|er-buffe|
|00005090| 72 2d 63 68 61 72 61 63 | 74 65 72 69 73 74 69 63 |r-charac|teristic|
|000050a0| 73 20 65 6d 65 72 67 65 | 2d 68 61 6e 64 6c 65 2d |s emerge|-handle-|
|000050b0| 6c 6f 63 61 6c 2d 76 61 | 72 69 61 62 6c 65 73 20 |local-va|riables |
|000050c0| 65 6d 65 72 67 65 2d 73 | 65 74 75 70 2d 77 69 6e |emerge-s|etup-win|
|000050d0| 64 6f 77 73 20 72 75 6e | 2d 68 6f 6f 6b 73 20 73 |dows run|-hooks s|
|000050e0| 74 61 72 74 75 70 2d 68 | 6f 6f 6b 73 20 65 6d 65 |tartup-h|ooks eme|
|000050f0| 72 67 65 2d 73 74 61 72 | 74 75 70 2d 68 6f 6f 6b |rge-star|tup-hook|
|00005100| 5d 20 36 5d 29 0a 28 64 | 65 66 61 6c 69 61 73 20 |] 6]).(d|efalias |
|00005110| 27 65 6d 65 72 67 65 2d | 6d 61 6b 65 2d 64 69 66 |'emerge-|make-dif|
|00005120| 66 2d 6c 69 73 74 20 23 | 5b 28 66 69 6c 65 2d 41 |f-list #|[(file-A|
|00005130| 20 66 69 6c 65 2d 42 29 | 20 22 c0 c1 21 1a 72 5c | file-B)| "..!.r\|
|00005140| 6e 71 88 c3 20 88 c4 c5 | c6 0e 07 0e 08 c9 0e 5c |nq.. ...|.......\|
|00005150| 6e 21 c9 0e 0b 21 25 cc | 5c 22 88 29 cd 0e 0e 5c |n!...!%.|\".)...\|
|00005160| 6e 5c 22 88 cf 0e 10 0e | 11 0e 12 d3 5c 6e 21 24 |n\".....|....\n!$|
|00005170| 29 87 22 20 5b 67 65 74 | 2d 62 75 66 66 65 72 2d |)." [get|-buffer-|
|00005180| 63 72 65 61 74 65 20 22 | 2a 65 6d 65 72 67 65 2d |create "|*emerge-|
|00005190| 64 69 66 66 2a 22 20 64 | 69 66 66 2d 62 75 66 66 |diff*" d|iff-buff|
|000051a0| 65 72 20 65 72 61 73 65 | 2d 62 75 66 66 65 72 20 |er erase|-buffer |
|000051b0| 73 68 65 6c 6c 2d 63 6f | 6d 6d 61 6e 64 20 66 6f |shell-co|mmand fo|
|000051c0| 72 6d 61 74 20 22 25 73 | 20 25 73 20 25 73 20 25 |rmat "%s| %s %s %|
|000051d0| 73 22 20 65 6d 65 72 67 | 65 2d 64 69 66 66 2d 70 |s" emerg|e-diff-p|
|000051e0| 72 6f 67 72 61 6d 20 65 | 6d 65 72 67 65 2d 64 69 |rogram e|merge-di|
|000051f0| 66 66 2d 6f 70 74 69 6f | 6e 73 20 65 6d 65 72 67 |ff-optio|ns emerg|
|00005200| 65 2d 70 72 6f 74 65 63 | 74 2d 6d 65 74 61 63 68 |e-protec|t-metach|
|00005210| 61 72 73 20 66 69 6c 65 | 2d 41 20 66 69 6c 65 2d |ars file|-A file-|
|00005220| 42 20 74 20 65 6d 65 72 | 67 65 2d 70 72 65 70 61 |B t emer|ge-prepa|
|00005230| 72 65 2d 65 72 72 6f 72 | 2d 6c 69 73 74 20 65 6d |re-error|-list em|
|00005240| 65 72 67 65 2d 64 69 66 | 66 2d 6f 6b 2d 6c 69 6e |erge-dif|f-ok-lin|
|00005250| 65 73 2d 72 65 67 65 78 | 70 20 65 6d 65 72 67 65 |es-regex|p emerge|
|00005260| 2d 63 6f 6e 76 65 72 74 | 2d 64 69 66 66 73 2d 74 |-convert|-diffs-t|
|00005270| 6f 2d 6d 61 72 6b 65 72 | 73 20 65 6d 65 72 67 65 |o-marker|s emerge|
|00005280| 2d 41 2d 62 75 66 66 65 | 72 20 65 6d 65 72 67 65 |-A-buffe|r emerge|
|00005290| 2d 42 2d 62 75 66 66 65 | 72 20 65 6d 65 72 67 65 |-B-buffe|r emerge|
|000052a0| 2d 6d 65 72 67 65 2d 62 | 75 66 66 65 72 20 65 6d |-merge-b|uffer em|
|000052b0| 65 72 67 65 2d 65 78 74 | 72 61 63 74 2d 64 69 66 |erge-ext|ract-dif|
|000052c0| 66 73 5d 20 38 5d 29 0a | 28 64 65 66 61 6c 69 61 |fs] 8]).|(defalia|
|000052d0| 73 20 27 65 6d 65 72 67 | 65 2d 65 78 74 72 61 63 |s 'emerg|e-extrac|
|000052e0| 74 2d 64 69 66 66 73 20 | 23 5b 28 64 69 66 66 2d |t-diffs |#[(diff-|
|000052f0| 62 75 66 66 65 72 29 20 | 22 c0 19 72 5c 6e 71 88 |buffer) |"..r\nq.|
|00005300| 65 62 88 c3 0c c0 c5 23 | 83 a2 00 c6 c7 94 c7 95 |eb.....#|........|
|00005310| 7b 21 1e 08 c9 94 c9 95 | 1e 5c 6e 89 1e 0b ab 89 |{!......|.\n.....|
|00005320| c6 0e 0b 0e 5c 6e 7b 21 | aa 82 0e 08 2a 1e 0c cd |....\n{!|....*...|
|00005330| 94 cd 95 7b 1e 0e c6 cf | 94 cf 95 7b 21 1e 10 d1 |...{....|...{!...|
|00005340| 94 d1 95 1e 5c 6e 89 1e | 0b ab 89 c6 0e 0b 0e 5c |....\n..|.......\|
|00005350| 6e 7b 21 aa 82 0e 10 2a | 1e 12 0e 0e d3 98 ab 8f |n{!....*|........|
|00005360| 0e 12 54 16 12 0e 08 54 | 89 16 08 16 0c aa 9f 0e |..T....T|........|
|00005370| 0e d4 98 ab 8f 0e 0c 54 | 16 0c 0e 10 54 89 16 10 |.......T|....T...|
|00005380| 16 12 aa 8a 0e 0c 54 16 | 0c 0e 12 54 16 12 d5 0e |......T.|...T....|
|00005390| 08 0e 0c 0e 10 0e 12 d6 | 25 09 42 11 2d 82 09 00 |........|%.B.-...|
|000053a0| 29 09 9f 29 87 22 20 5b | 6e 69 6c 20 6c 69 73 74 |)..)." [|nil list|
|000053b0| 20 64 69 66 66 2d 62 75 | 66 66 65 72 20 72 65 2d | diff-bu|ffer re-|
|000053c0| 73 65 61 72 63 68 2d 66 | 6f 72 77 61 72 64 20 65 |search-f|orward e|
|000053d0| 6d 65 72 67 65 2d 6d 61 | 74 63 68 2d 64 69 66 66 |merge-ma|tch-diff|
|000053e0| 2d 6c 69 6e 65 20 74 20 | 73 74 72 69 6e 67 2d 74 |-line t |string-t|
|000053f0| 6f 2d 69 6e 74 20 31 20 | 61 2d 62 65 67 69 6e 20 |o-int 1 |a-begin |
|00005400| 33 20 65 20 62 20 61 2d | 65 6e 64 20 34 20 64 69 |3 e b a-|end 4 di|
|00005410| 66 66 2d 74 79 70 65 20 | 35 20 62 2d 62 65 67 69 |ff-type |5 b-begi|
|00005420| 6e 20 37 20 62 2d 65 6e | 64 20 22 61 22 20 22 64 |n 7 b-en|d "a" "d|
|00005430| 22 20 76 65 63 74 6f 72 | 20 64 65 66 61 75 6c 74 |" vector| default|
|00005440| 2d 41 5d 20 37 5d 29 0a | 28 64 65 66 61 6c 69 61 |-A] 7]).|(defalia|
|00005450| 73 20 27 65 6d 65 72 67 | 65 2d 70 72 65 70 61 72 |s 'emerg|e-prepar|
|00005460| 65 2d 65 72 72 6f 72 2d | 6c 69 73 74 20 23 5b 28 |e-error-|list #[(|
|00005470| 6f 6b 2d 72 65 67 65 78 | 70 20 64 69 66 66 2d 62 |ok-regex|p diff-b|
|00005480| 75 66 66 65 72 29 20 22 | c0 c1 21 12 72 5c 6e 71 |uffer) "|..!.r\nq|
|00005490| 88 c3 20 88 c4 0d 21 88 | c6 0e 07 21 29 87 22 20 |.. ...!.|...!)." |
|000054a0| 5b 67 65 74 2d 62 75 66 | 66 65 72 2d 63 72 65 61 |[get-buf|fer-crea|
|000054b0| 74 65 20 22 2a 65 6d 65 | 72 67 65 2d 64 69 66 66 |te "*eme|rge-diff|
|000054c0| 2d 65 72 72 6f 72 73 2a | 22 20 65 6d 65 72 67 65 |-errors*|" emerge|
|000054d0| 2d 64 69 66 66 2d 65 72 | 72 6f 72 2d 62 75 66 66 |-diff-er|ror-buff|
|000054e0| 65 72 20 65 72 61 73 65 | 2d 62 75 66 66 65 72 20 |er erase|-buffer |
|000054f0| 69 6e 73 65 72 74 2d 62 | 75 66 66 65 72 20 64 69 |insert-b|uffer di|
|00005500| 66 66 2d 62 75 66 66 65 | 72 20 64 65 6c 65 74 65 |ff-buffe|r delete|
|00005510| 2d 6d 61 74 63 68 69 6e | 67 2d 6c 69 6e 65 73 20 |-matchin|g-lines |
|00005520| 6f 6b 2d 72 65 67 65 78 | 70 5d 20 32 5d 29 0a 28 |ok-regex|p] 2]).(|
|00005530| 64 65 66 61 6c 69 61 73 | 20 27 65 6d 65 72 67 65 |defalias| 'emerge|
|00005540| 2d 66 69 6c 65 73 2d 77 | 69 74 68 2d 61 6e 63 65 |-files-w|ith-ance|
|00005550| 73 74 6f 72 2d 69 6e 74 | 65 72 6e 61 6c 20 23 5b |stor-int|ernal #[|
|00005560| 28 66 69 6c 65 2d 41 20 | 66 69 6c 65 2d 42 20 66 |(file-A |file-B f|
|00005570| 69 6c 65 2d 61 6e 63 65 | 73 74 6f 72 20 26 6f 70 |ile-ance|stor &op|
|00005580| 74 69 6f 6e 61 6c 20 73 | 74 61 72 74 75 70 2d 68 |tional s|tartup-h|
|00005590| 6f 6f 6b 73 20 71 75 69 | 74 2d 68 6f 6f 6b 73 20 |ooks qui|t-hooks |
|000055a0| 6f 75 74 70 75 74 2d 66 | 69 6c 65 29 20 22 c0 09 |output-f|ile) "..|
|000055b0| 21 ac 85 c2 c3 09 5c 22 | 88 c0 0c 21 ac 85 c2 c3 |!.....\"|...!....|
|000055c0| 0c 5c 22 88 c0 0d 21 ac | 85 c2 c3 0d 5c 22 88 c6 |.\"...!.|....\"..|
|000055d0| 09 21 c6 0c 21 c6 0d 21 | 1e 07 1e 08 1e 09 ca 09 |.!..!..!|........|
|000055e0| 21 16 0b ca 0c 21 16 0c | ca 0d 21 16 0d 0e 0e ab |!....!..|..!.....|
|000055f0| 86 ca 0e 0e 21 16 0f 72 | 0e 09 71 88 7e 88 d0 20 |....!..r|..q.~.. |
|00005600| ab 99 d1 d2 21 11 d3 65 | 64 09 d4 d5 25 88 d6 d4 |....!..e|d...%...|
|00005610| d7 09 44 45 0e 18 42 16 | 18 aa 83 d9 20 88 29 72 |..DE..B.|.... .)r|
|00005620| 0e 08 71 88 7e 88 d0 20 | ab 99 d1 da 21 14 d3 65 |..q.~.. |....!..e|
|00005630| 64 0c d4 d5 25 88 d6 d4 | d7 0c 44 45 0e 18 42 16 |d...%...|..DE..B.|
|00005640| 18 aa 83 d9 20 88 29 72 | 0e 07 71 88 7e 88 d0 20 |.... .)r|..q.~.. |
|00005650| ab 99 d1 db 21 15 d3 65 | 64 0d d4 d5 25 88 d6 d4 |....!..e|d...%...|
|00005660| d7 0d 44 45 0e 18 42 16 | 18 aa 83 d9 20 88 29 dc |..DE..B.|.... .).|
|00005670| 0e 09 09 0e 08 0c 0e 07 | 0d 0e 18 0e 1d 0e 0e 26 |........|.......&|
|00005680| 09 2b 87 22 20 5b 66 69 | 6c 65 2d 72 65 61 64 61 |.+." [fi|le-reada|
|00005690| 62 6c 65 2d 70 20 66 69 | 6c 65 2d 41 20 65 72 72 |ble-p fi|le-A err|
|000056a0| 6f 72 20 22 46 69 6c 65 | 20 5c 22 25 73 5c 22 20 |or "File| \"%s\" |
|000056b0| 64 6f 65 73 20 6e 6f 74 | 20 65 78 69 73 74 20 6f |does not| exist o|
|000056c0| 72 20 69 73 20 6e 6f 74 | 20 72 65 61 64 61 62 6c |r is not| readabl|
|000056d0| 65 22 20 66 69 6c 65 2d | 42 20 66 69 6c 65 2d 61 |e" file-|B file-a|
|000056e0| 6e 63 65 73 74 6f 72 20 | 66 69 6e 64 2d 66 69 6c |ncestor |find-fil|
|000056f0| 65 2d 6e 6f 73 65 6c 65 | 63 74 20 62 75 66 66 65 |e-nosele|ct buffe|
|00005700| 72 2d 61 6e 63 65 73 74 | 6f 72 20 62 75 66 66 65 |r-ancest|or buffe|
|00005710| 72 2d 42 20 62 75 66 66 | 65 72 2d 41 20 66 69 6c |r-B buff|er-A fil|
|00005720| 65 2d 6e 61 6d 65 2d 64 | 69 72 65 63 74 6f 72 79 |e-name-d|irectory|
|00005730| 20 65 6d 65 72 67 65 2d | 6c 61 73 74 2d 64 69 72 | emerge-|last-dir|
|00005740| 2d 41 20 65 6d 65 72 67 | 65 2d 6c 61 73 74 2d 64 |-A emerg|e-last-d|
|00005750| 69 72 2d 42 20 65 6d 65 | 72 67 65 2d 6c 61 73 74 |ir-B eme|rge-last|
|00005760| 2d 64 69 72 2d 61 6e 63 | 65 73 74 6f 72 20 6f 75 |-dir-anc|estor ou|
|00005770| 74 70 75 74 2d 66 69 6c | 65 20 65 6d 65 72 67 65 |tput-fil|e emerge|
|00005780| 2d 6c 61 73 74 2d 64 69 | 72 2d 6f 75 74 70 75 74 |-last-di|r-output|
|00005790| 20 65 6d 65 72 67 65 2d | 72 65 6d 6f 74 65 2d 66 | emerge-|remote-f|
|000057a0| 69 6c 65 2d 70 20 65 6d | 65 72 67 65 2d 6d 61 6b |ile-p em|erge-mak|
|000057b0| 65 2d 74 65 6d 70 2d 66 | 69 6c 65 20 22 41 22 20 |e-temp-f|ile "A" |
|000057c0| 77 72 69 74 65 2d 72 65 | 67 69 6f 6e 20 6e 69 6c |write-re|gion nil|
|000057d0| 20 6e 6f 2d 6d 65 73 73 | 61 67 65 20 6c 61 6d 62 | no-mess|age lamb|
|000057e0| 64 61 20 64 65 6c 65 74 | 65 2d 66 69 6c 65 20 73 |da delet|e-file s|
|000057f0| 74 61 72 74 75 70 2d 68 | 6f 6f 6b 73 20 65 6d 65 |tartup-h|ooks eme|
|00005800| 72 67 65 2d 76 65 72 69 | 66 79 2d 66 69 6c 65 2d |rge-veri|fy-file-|
|00005810| 62 75 66 66 65 72 20 22 | 42 22 20 22 61 6e 63 22 |buffer "|B" "anc"|
|00005820| 20 65 6d 65 72 67 65 2d | 73 65 74 75 70 2d 77 69 | emerge-|setup-wi|
|00005830| 74 68 2d 61 6e 63 65 73 | 74 6f 72 20 71 75 69 74 |th-ances|tor quit|
|00005840| 2d 68 6f 6f 6b 73 5d 20 | 31 30 5d 29 0a 28 64 65 |-hooks] |10]).(de|
|00005850| 66 61 6c 69 61 73 20 27 | 65 6d 65 72 67 65 2d 73 |falias '|emerge-s|
|00005860| 65 74 75 70 2d 77 69 74 | 68 2d 61 6e 63 65 73 74 |etup-wit|h-ancest|
|00005870| 6f 72 20 23 5b 28 62 75 | 66 66 65 72 2d 41 20 66 |or #[(bu|ffer-A f|
|00005880| 69 6c 65 2d 41 20 62 75 | 66 66 65 72 2d 42 20 66 |ile-A bu|ffer-B f|
|00005890| 69 6c 65 2d 42 20 62 75 | 66 66 65 72 2d 61 6e 63 |ile-B bu|ffer-anc|
|000058a0| 65 73 74 6f 72 20 66 69 | 6c 65 2d 61 6e 63 65 73 |estor fi|le-ances|
|000058b0| 74 6f 72 20 26 6f 70 74 | 69 6f 6e 61 6c 20 73 74 |tor &opt|ional st|
|000058c0| 61 72 74 75 70 2d 68 6f | 6f 6b 73 20 71 75 69 74 |artup-ho|oks quit|
|000058d0| 2d 68 6f 6f 6b 73 20 6f | 75 74 70 75 74 2d 66 69 |-hooks o|utput-fi|
|000058e0| 6c 65 29 20 22 c0 09 21 | 11 c0 5c 6e 21 12 c0 0b |le) "..!|..\n!...|
|000058f0| 21 13 0c ad 83 c0 0c 21 | 14 c5 c6 c7 5c 22 1e 08 |!......!|....\"..|
|00005900| 72 0e 09 71 88 ca 0e 08 | 21 29 1e 0b 72 0e 0b 71 |r..q....|!)..r..q|
|00005910| 88 cc 0e 09 21 88 cd 16 | 0e cf d0 21 88 d1 16 12 |....!...|...!....|
|00005920| 0e 09 16 13 0e 14 16 15 | 0e 16 16 17 0e 0b 16 18 |........|........|
|00005930| 0c ab 85 d9 0c 50 aa 86 | da db 0e 0b 21 50 16 1c |.....P..|....!P..|
|00005940| dd 0e 13 21 88 de 20 88 | df 09 5c 6e 0b 23 89 16 |...!.. .|..\n.#..|
|00005950| 20 47 16 21 e2 16 23 0e | 24 16 25 e6 20 88 e7 20 | G.!..#.|$.%. .. |
|00005960| 88 e8 20 88 29 e9 0e 09 | 0e 14 0e 0b d1 24 88 72 |.. .)...|.....$.r|
|00005970| 0e 0b 71 88 ea eb ec 5c | 22 88 d1 89 16 0e 2b 87 |..q....\|".....+.|
|00005980| 22 20 5b 65 78 70 61 6e | 64 2d 66 69 6c 65 2d 6e |" [expan|d-file-n|
|00005990| 61 6d 65 20 66 69 6c 65 | 2d 41 20 66 69 6c 65 2d |ame file|-A file-|
|000059a0| 42 20 66 69 6c 65 2d 61 | 6e 63 65 73 74 6f 72 20 |B file-a|ncestor |
|000059b0| 6f 75 74 70 75 74 2d 66 | 69 6c 65 20 65 6d 65 72 |output-f|ile emer|
|000059c0| 67 65 2d 75 6e 69 71 75 | 65 2d 62 75 66 66 65 72 |ge-uniqu|e-buffer|
|000059d0| 2d 6e 61 6d 65 20 22 2a | 6d 65 72 67 65 22 20 22 |-name "*|merge" "|
|000059e0| 2a 22 20 6d 65 72 67 65 | 2d 62 75 66 66 65 72 2d |*" merge|-buffer-|
|000059f0| 6e 61 6d 65 20 62 75 66 | 66 65 72 2d 41 20 67 65 |name buf|fer-A ge|
|00005a00| 74 2d 62 75 66 66 65 72 | 2d 63 72 65 61 74 65 20 |t-buffer|-create |
|00005a10| 6d 65 72 67 65 2d 62 75 | 66 66 65 72 20 65 6d 65 |merge-bu|ffer eme|
|00005a20| 72 67 65 2d 63 6f 70 79 | 2d 6d 6f 64 65 73 20 6e |rge-copy|-modes n|
|00005a30| 69 6c 20 62 75 66 66 65 | 72 2d 72 65 61 64 2d 6f |il buffe|r-read-o|
|00005a40| 6e 6c 79 20 61 75 74 6f | 2d 73 61 76 65 2d 6d 6f |nly auto|-save-mo|
|00005a50| 64 65 20 31 20 74 20 65 | 6d 65 72 67 65 2d 6d 6f |de 1 t e|merge-mo|
|00005a60| 64 65 20 65 6d 65 72 67 | 65 2d 41 2d 62 75 66 66 |de emerg|e-A-buff|
|00005a70| 65 72 20 62 75 66 66 65 | 72 2d 42 20 65 6d 65 72 |er buffe|r-B emer|
|00005a80| 67 65 2d 42 2d 62 75 66 | 66 65 72 20 62 75 66 66 |ge-B-buf|fer buff|
|00005a90| 65 72 2d 61 6e 63 65 73 | 74 6f 72 20 65 6d 65 72 |er-ances|tor emer|
|00005aa0| 67 65 2d 61 6e 63 65 73 | 74 6f 72 2d 62 75 66 66 |ge-ances|tor-buff|
|00005ab0| 65 72 20 65 6d 65 72 67 | 65 2d 6d 65 72 67 65 2d |er emerg|e-merge-|
|00005ac0| 62 75 66 66 65 72 20 22 | 4f 75 74 70 75 74 20 74 |buffer "|Output t|
|00005ad0| 6f 20 66 69 6c 65 3a 20 | 22 20 22 4f 75 74 70 75 |o file: |" "Outpu|
|00005ae0| 74 20 74 6f 20 62 75 66 | 66 65 72 3a 20 22 20 62 |t to buf|fer: " b|
|00005af0| 75 66 66 65 72 2d 6e 61 | 6d 65 20 65 6d 65 72 67 |uffer-na|me emerg|
|00005b00| 65 2d 6f 75 74 70 75 74 | 2d 64 65 73 63 72 69 70 |e-output|-descrip|
|00005b10| 74 69 6f 6e 20 69 6e 73 | 65 72 74 2d 62 75 66 66 |tion ins|ert-buff|
|00005b20| 65 72 20 65 6d 65 72 67 | 65 2d 73 65 74 2d 6b 65 |er emerg|e-set-ke|
|00005b30| 79 73 20 65 6d 65 72 67 | 65 2d 6d 61 6b 65 2d 64 |ys emerg|e-make-d|
|00005b40| 69 66 66 33 2d 6c 69 73 | 74 20 65 6d 65 72 67 65 |iff3-lis|t emerge|
|00005b50| 2d 64 69 66 66 65 72 65 | 6e 63 65 2d 6c 69 73 74 |-differe|nce-list|
|00005b60| 20 65 6d 65 72 67 65 2d | 6e 75 6d 62 65 72 2d 6f | emerge-|number-o|
|00005b70| 66 2d 64 69 66 66 65 72 | 65 6e 63 65 73 20 2d 31 |f-differ|ences -1|
|00005b80| 20 65 6d 65 72 67 65 2d | 63 75 72 72 65 6e 74 2d | emerge-|current-|
|00005b90| 64 69 66 66 65 72 65 6e | 63 65 20 71 75 69 74 2d |differen|ce quit-|
|00005ba0| 68 6f 6f 6b 73 20 65 6d | 65 72 67 65 2d 71 75 69 |hooks em|erge-qui|
|00005bb0| 74 2d 68 6f 6f 6b 20 65 | 6d 65 72 67 65 2d 72 65 |t-hook e|merge-re|
|00005bc0| 6d 65 6d 62 65 72 2d 62 | 75 66 66 65 72 2d 63 68 |member-b|uffer-ch|
|00005bd0| 61 72 61 63 74 65 72 69 | 73 74 69 63 73 20 65 6d |aracteri|stics em|
|00005be0| 65 72 67 65 2d 73 65 6c | 65 63 74 2d 70 72 65 66 |erge-sel|ect-pref|
|00005bf0| 65 72 2d 42 73 20 65 6d | 65 72 67 65 2d 68 61 6e |er-Bs em|erge-han|
|00005c00| 64 6c 65 2d 6c 6f 63 61 | 6c 2d 76 61 72 69 61 62 |dle-loca|l-variab|
|00005c10| 6c 65 73 20 65 6d 65 72 | 67 65 2d 73 65 74 75 70 |les emer|ge-setup|
|00005c20| 2d 77 69 6e 64 6f 77 73 | 20 72 75 6e 2d 68 6f 6f |-windows| run-hoo|
|00005c30| 6b 73 20 73 74 61 72 74 | 75 70 2d 68 6f 6f 6b 73 |ks start|up-hooks|
|00005c40| 20 65 6d 65 72 67 65 2d | 73 74 61 72 74 75 70 2d | emerge-|startup-|
|00005c50| 68 6f 6f 6b 5d 20 36 5d | 29 0a 28 64 65 66 61 6c |hook] 6]|).(defal|
|00005c60| 69 61 73 20 27 65 6d 65 | 72 67 65 2d 6d 61 6b 65 |ias 'eme|rge-make|
|00005c70| 2d 64 69 66 66 33 2d 6c | 69 73 74 20 23 5b 28 66 |-diff3-l|ist #[(f|
|00005c80| 69 6c 65 2d 41 20 66 69 | 6c 65 2d 42 20 66 69 6c |ile-A fi|le-B fil|
|00005c90| 65 2d 61 6e 63 65 73 74 | 6f 72 29 20 22 c0 c1 21 |e-ancest|or) "..!|
|00005ca0| 1a 72 5c 6e 71 88 c3 20 | 88 c4 c5 c6 0e 07 0e 08 |.r\nq.. |........|
|00005cb0| c9 0e 5c 6e 21 c9 0e 0b | 21 c9 0e 0c 21 26 06 cd |..\n!...|!...!&..|
|00005cc0| 5c 22 88 29 ce 0e 0f 5c | 6e 5c 22 88 d0 0e 11 0e |\".)...\|n\".....|
|00005cd0| 12 0e 13 d4 5c 6e 21 24 | 29 87 22 20 5b 67 65 74 |....\n!$|)." [get|
|00005ce0| 2d 62 75 66 66 65 72 2d | 63 72 65 61 74 65 20 22 |-buffer-|create "|
|00005cf0| 2a 65 6d 65 72 67 65 2d | 64 69 66 66 2a 22 20 64 |*emerge-|diff*" d|
|00005d00| 69 66 66 2d 62 75 66 66 | 65 72 20 65 72 61 73 65 |iff-buff|er erase|
|00005d10| 2d 62 75 66 66 65 72 20 | 73 68 65 6c 6c 2d 63 6f |-buffer |shell-co|
|00005d20| 6d 6d 61 6e 64 20 66 6f | 72 6d 61 74 20 22 25 73 |mmand fo|rmat "%s|
|00005d30| 20 25 73 20 25 73 20 25 | 73 20 25 73 22 20 65 6d | %s %s %|s %s" em|
|00005d40| 65 72 67 65 2d 64 69 66 | 66 33 2d 70 72 6f 67 72 |erge-dif|f3-progr|
|00005d50| 61 6d 20 65 6d 65 72 67 | 65 2d 64 69 66 66 2d 6f |am emerg|e-diff-o|
|00005d60| 70 74 69 6f 6e 73 20 65 | 6d 65 72 67 65 2d 70 72 |ptions e|merge-pr|
|00005d70| 6f 74 65 63 74 2d 6d 65 | 74 61 63 68 61 72 73 20 |otect-me|tachars |
|00005d80| 66 69 6c 65 2d 61 6e 63 | 65 73 74 6f 72 20 66 69 |file-anc|estor fi|
|00005d90| 6c 65 2d 41 20 66 69 6c | 65 2d 42 20 74 20 65 6d |le-A fil|e-B t em|
|00005da0| 65 72 67 65 2d 70 72 65 | 70 61 72 65 2d 65 72 72 |erge-pre|pare-err|
|00005db0| 6f 72 2d 6c 69 73 74 20 | 65 6d 65 72 67 65 2d 64 |or-list |emerge-d|
|00005dc0| 69 66 66 33 2d 6f 6b 2d | 6c 69 6e 65 73 2d 72 65 |iff3-ok-|lines-re|
|00005dd0| 67 65 78 70 20 65 6d 65 | 72 67 65 2d 63 6f 6e 76 |gexp eme|rge-conv|
|00005de0| 65 72 74 2d 64 69 66 66 | 73 2d 74 6f 2d 6d 61 72 |ert-diff|s-to-mar|
|00005df0| 6b 65 72 73 20 65 6d 65 | 72 67 65 2d 41 2d 62 75 |kers eme|rge-A-bu|
|00005e00| 66 66 65 72 20 65 6d 65 | 72 67 65 2d 42 2d 62 75 |ffer eme|rge-B-bu|
|00005e10| 66 66 65 72 20 65 6d 65 | 72 67 65 2d 6d 65 72 67 |ffer eme|rge-merg|
|00005e20| 65 2d 62 75 66 66 65 72 | 20 65 6d 65 72 67 65 2d |e-buffer| emerge-|
|00005e30| 65 78 74 72 61 63 74 2d | 64 69 66 66 73 33 5d 20 |extract-|diffs3] |
|00005e40| 39 5d 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |9]).(def|alias 'e|
|00005e50| 6d 65 72 67 65 2d 65 78 | 74 72 61 63 74 2d 64 69 |merge-ex|tract-di|
|00005e60| 66 66 73 33 20 23 5b 28 | 64 69 66 66 2d 62 75 66 |ffs3 #[(|diff-buf|
|00005e70| 66 65 72 29 20 22 c0 19 | 72 5c 6e 71 88 c3 c4 c0 |fer) "..|r\nq....|
|00005e80| c5 23 ab ca c6 79 88 c6 | 94 c6 95 7b 89 1e 07 c8 |.#...y..|...{....|
|00005e90| 98 ac b8 60 1e 09 ca cb | 21 1e 0c 0e 09 62 88 ca |...`....|!....b..|
|00005ea0| cd 21 1e 0e cf 0e 0c 40 | 0e 0c 41 40 0e 0e 40 0e |.!.....@|..A@..@.|
|00005eb0| 0e 41 40 0e 07 cb 98 ab | 83 d0 aa 8a 0e 07 cd 98 |.A@.....|........|
|00005ec0| ab 83 d1 aa 81 d2 25 2b | 09 42 11 29 aa 2f 29 09 |......%+|.B.)./).|
|00005ed0| 9f 29 87 22 20 5b 6e 69 | 6c 20 6c 69 73 74 20 64 |.)." [ni|l list d|
|00005ee0| 69 66 66 2d 62 75 66 66 | 65 72 20 72 65 2d 73 65 |iff-buff|er re-se|
|00005ef0| 61 72 63 68 2d 66 6f 72 | 77 61 72 64 20 22 5e 3d |arch-for|ward "^=|
|00005f00| 3d 3d 3d 5c 5c 28 2e 3f | 5c 5c 29 24 22 20 74 20 |===\\(.?|\\)$" t |
|00005f10| 31 20 61 67 72 65 65 6d | 65 6e 74 20 22 31 22 20 |1 agreem|ent "1" |
|00005f20| 70 6f 73 20 65 6d 65 72 | 67 65 2d 67 65 74 2d 64 |pos emer|ge-get-d|
|00005f30| 69 66 66 33 2d 67 72 6f | 75 70 20 22 32 22 20 67 |iff3-gro|up "2" g|
|00005f40| 72 6f 75 70 2d 32 20 22 | 33 22 20 67 72 6f 75 70 |roup-2 "|3" group|
|00005f50| 2d 33 20 76 65 63 74 6f | 72 20 70 72 65 66 65 72 |-3 vecto|r prefer|
|00005f60| 2d 41 20 70 72 65 66 65 | 72 2d 42 20 64 65 66 61 |-A prefe|r-B defa|
|00005f70| 75 6c 74 2d 41 5d 20 38 | 5d 29 0a 28 64 65 66 61 |ult-A] 8|]).(defa|
|00005f80| 6c 69 61 73 20 27 65 6d | 65 72 67 65 2d 67 65 74 |lias 'em|erge-get|
|00005f90| 2d 64 69 66 66 33 2d 67 | 72 6f 75 70 20 23 5b 28 |-diff3-g|roup #[(|
|00005fa0| 66 69 6c 65 29 20 22 8a | c0 c1 5c 6e c3 51 21 88 |file) ".|..\n.Q!.|
|00005fb0| c4 79 88 c5 94 c5 95 7b | c6 98 ab a6 c7 94 ab 92 |.y.....{|........|
|00005fc0| c8 c4 94 c4 95 7b 21 c8 | c9 94 c9 95 7b 21 54 44 |.....{!.|....{!TD|
|00005fd0| aa 9a c8 c4 94 c4 95 7b | 21 89 1e 5c 6e 89 54 29 |.......{|!..\n.T)|
|00005fe0| 44 aa 8a c8 c4 94 c4 95 | 7b 21 54 89 44 29 87 22 |D.......|{!T.D)."|
|00005ff0| 20 5b 72 65 2d 73 65 61 | 72 63 68 2d 66 6f 72 77 | [re-sea|rch-forw|
|00006000| 61 72 64 20 22 5e 22 20 | 66 69 6c 65 20 22 3a 5c |ard "^" |file ":\|
|00006010| 5c 28 5b 30 2d 39 5d 2b | 5c 5c 29 5c 5c 28 2c 5c |\([0-9]+|\\)\\(,\|
|00006020| 5c 28 5b 30 2d 39 5d 2b | 5c 5c 29 5c 5c 29 3f 5c |\([0-9]+|\\)\\)?\|
|00006030| 5c 28 5b 61 63 5d 5c 5c | 29 24 22 20 31 20 34 20 |\([ac]\\|)$" 1 4 |
|00006040| 22 63 22 20 32 20 73 74 | 72 69 6e 67 2d 74 6f 2d |"c" 2 st|ring-to-|
|00006050| 69 6e 74 20 33 20 78 5d | 20 35 5d 29 0a 23 40 32 |int 3 x]| 5]).#@2|
|00006060| 36 20 52 75 6e 20 45 6d | 65 72 67 65 20 6f 6e 20 |6 Run Em|erge on |
|00006070| 74 77 6f 20 66 69 6c 65 | 73 2e 1f 0a 28 64 65 66 |two file|s...(def|
|00006080| 61 6c 69 61 73 20 27 65 | 6d 65 72 67 65 2d 66 69 |alias 'e|merge-fi|
|00006090| 6c 65 73 20 23 5b 28 61 | 72 67 20 66 69 6c 65 2d |les #[(a|rg file-|
|000060a0| 41 20 66 69 6c 65 2d 42 | 20 66 69 6c 65 2d 6f 75 |A file-B| file-ou|
|000060b0| 74 20 26 6f 70 74 69 6f | 6e 61 6c 20 73 74 61 72 |t &optio|nal star|
|000060c0| 74 75 70 2d 68 6f 6f 6b | 73 20 71 75 69 74 2d 68 |tup-hook|s quit-h|
|000060d0| 6f 6f 6b 73 29 20 22 c0 | 09 5c 6e 0b 0c ab 8b c5 |ooks) ".|.\n.....|
|000060e0| c6 c7 0c 44 45 0e 08 42 | aa 82 0e 08 0c 25 87 22 |...DE..B|.....%."|
|000060f0| 20 5b 65 6d 65 72 67 65 | 2d 66 69 6c 65 73 2d 69 | [emerge|-files-i|
|00006100| 6e 74 65 72 6e 61 6c 20 | 66 69 6c 65 2d 41 20 66 |nternal |file-A f|
|00006110| 69 6c 65 2d 42 20 73 74 | 61 72 74 75 70 2d 68 6f |ile-B st|artup-ho|
|00006120| 6f 6b 73 20 66 69 6c 65 | 2d 6f 75 74 20 6c 61 6d |oks file|-out lam|
|00006130| 62 64 61 20 6e 69 6c 20 | 65 6d 65 72 67 65 2d 66 |bda nil |emerge-f|
|00006140| 69 6c 65 73 2d 65 78 69 | 74 20 71 75 69 74 2d 68 |iles-exi|t quit-h|
|00006150| 6f 6f 6b 73 5d 20 38 20 | 28 23 24 20 2e 20 32 34 |ooks] 8 |(#$ . 24|
|00006160| 36 37 34 29 20 28 6c 65 | 74 20 28 66 29 20 28 6c |674) (le|t (f) (l|
|00006170| 69 73 74 20 63 75 72 72 | 65 6e 74 2d 70 72 65 66 |ist curr|ent-pref|
|00006180| 69 78 2d 61 72 67 20 28 | 73 65 74 71 20 66 20 28 |ix-arg (|setq f (|
|00006190| 65 6d 65 72 67 65 2d 72 | 65 61 64 2d 66 69 6c 65 |emerge-r|ead-file|
|000061a0| 2d 6e 61 6d 65 20 22 46 | 69 6c 65 20 41 20 74 6f |-name "F|ile A to|
|000061b0| 20 6d 65 72 67 65 22 20 | 65 6d 65 72 67 65 2d 6c | merge" |emerge-l|
|000061c0| 61 73 74 2d 64 69 72 2d | 41 20 6e 69 6c 20 6e 69 |ast-dir-|A nil ni|
|000061d0| 6c 20 74 29 29 20 28 65 | 6d 65 72 67 65 2d 72 65 |l t)) (e|merge-re|
|000061e0| 61 64 2d 66 69 6c 65 2d | 6e 61 6d 65 20 22 46 69 |ad-file-|name "Fi|
|000061f0| 6c 65 20 42 20 74 6f 20 | 6d 65 72 67 65 22 20 65 |le B to |merge" e|
|00006200| 6d 65 72 67 65 2d 6c 61 | 73 74 2d 64 69 72 2d 42 |merge-la|st-dir-B|
|00006210| 20 6e 69 6c 20 66 20 74 | 29 20 28 61 6e 64 20 63 | nil f t|) (and c|
|00006220| 75 72 72 65 6e 74 2d 70 | 72 65 66 69 78 2d 61 72 |urrent-p|refix-ar|
|00006230| 67 20 28 65 6d 65 72 67 | 65 2d 72 65 61 64 2d 66 |g (emerg|e-read-f|
|00006240| 69 6c 65 2d 6e 61 6d 65 | 20 22 4f 75 74 70 75 74 |ile-name| "Output|
|00006250| 20 66 69 6c 65 22 20 65 | 6d 65 72 67 65 2d 6c 61 | file" e|merge-la|
|00006260| 73 74 2d 64 69 72 2d 6f | 75 74 70 75 74 20 66 20 |st-dir-o|utput f |
|00006270| 66 20 6e 69 6c 29 29 29 | 29 5d 29 0a 28 66 73 65 |f nil)))|)]).(fse|
|00006280| 74 20 27 65 6d 65 72 67 | 65 20 27 65 6d 65 72 67 |t 'emerg|e 'emerg|
|00006290| 65 2d 66 69 6c 65 73 29 | 0a 23 40 36 33 20 52 75 |e-files)|.#@63 Ru|
|000062a0| 6e 20 45 6d 65 72 67 65 | 20 6f 6e 20 74 77 6f 20 |n Emerge| on two |
|000062b0| 66 69 6c 65 73 2c 20 67 | 69 76 69 6e 67 20 61 6e |files, g|iving an|
|000062c0| 6f 74 68 65 72 20 66 69 | 6c 65 20 61 73 20 74 68 |other fi|le as th|
|000062d0| 65 20 61 6e 63 65 73 74 | 6f 72 2e 1f 0a 28 64 65 |e ancest|or...(de|
|000062e0| 66 61 6c 69 61 73 20 27 | 65 6d 65 72 67 65 2d 66 |falias '|emerge-f|
|000062f0| 69 6c 65 73 2d 77 69 74 | 68 2d 61 6e 63 65 73 74 |iles-wit|h-ancest|
|00006300| 6f 72 20 23 5b 28 61 72 | 67 20 66 69 6c 65 2d 41 |or #[(ar|g file-A|
|00006310| 20 66 69 6c 65 2d 42 20 | 66 69 6c 65 2d 61 6e 63 | file-B |file-anc|
|00006320| 65 73 74 6f 72 20 66 69 | 6c 65 2d 6f 75 74 20 26 |estor fi|le-out &|
|00006330| 6f 70 74 69 6f 6e 61 6c | 20 73 74 61 72 74 75 70 |optional| startup|
|00006340| 2d 68 6f 6f 6b 73 20 71 | 75 69 74 2d 68 6f 6f 6b |-hooks q|uit-hook|
|00006350| 73 29 20 22 c0 09 5c 6e | 0b 0c 0d ab 8b c6 c7 c8 |s) "..\n|........|
|00006360| 0d 44 45 0e 09 42 aa 82 | 0e 09 0d 26 06 87 22 20 |.DE..B..|...&.." |
|00006370| 5b 65 6d 65 72 67 65 2d | 66 69 6c 65 73 2d 77 69 |[emerge-|files-wi|
|00006380| 74 68 2d 61 6e 63 65 73 | 74 6f 72 2d 69 6e 74 65 |th-ances|tor-inte|
|00006390| 72 6e 61 6c 20 66 69 6c | 65 2d 41 20 66 69 6c 65 |rnal fil|e-A file|
|000063a0| 2d 42 20 66 69 6c 65 2d | 61 6e 63 65 73 74 6f 72 |-B file-|ancestor|
|000063b0| 20 73 74 61 72 74 75 70 | 2d 68 6f 6f 6b 73 20 66 | startup|-hooks f|
|000063c0| 69 6c 65 2d 6f 75 74 20 | 6c 61 6d 62 64 61 20 6e |ile-out |lambda n|
|000063d0| 69 6c 20 65 6d 65 72 67 | 65 2d 66 69 6c 65 73 2d |il emerg|e-files-|
|000063e0| 65 78 69 74 20 71 75 69 | 74 2d 68 6f 6f 6b 73 5d |exit qui|t-hooks]|
|000063f0| 20 39 20 28 23 24 20 2e | 20 32 35 32 34 36 29 20 | 9 (#$ .| 25246) |
+--------+-------------------------+-------------------------+--------+--------+
Only 25.0 KB of data is shown above.
